CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-03 11:05:23 +12:00
Code Issues Projects Releases Wiki Activity

Add some foolproofing

Browse source
This commit is contained in:
Caeden Statia 2020-02-07 17:26:06 -08:00
parent bd222a5f17
commit eaba02cfc5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ModAssistant/Classes/Themes.cs
View file

@ -65,8 +65,7 @@ namespace ModAssistant
/// <param name="element">Page that this is called on (Used for refreshing button icon colors).</param>
public static void ApplyTheme(string theme)
{
ResourceDictionary newTheme = loadedThemes[theme];
if (newTheme != null)
if (loadedThemes.TryGetValue(theme, out ResourceDictionary newTheme))
{
Application.Current.Resources.MergedDictionaries.RemoveAt(0);
LoadedTheme = theme;
@ -119,7 +118,15 @@ namespace ModAssistant
if (localUri) location = $"Themes/{name}.xaml";
Uri uri = new Uri(location, localUri ? UriKind.Relative : UriKind.Absolute);
ResourceDictionary dictionary = new ResourceDictionary();
dictionary.Source = uri;
try
{
dictionary.Source = uri;
}
catch(Exception ex)
{
MessageBox.Show($"Could not load {name}.\n\n{ex.Message}\n\nIgnoring...");
return null;
}
return dictionary;
}