Merge branch 'stefnotch-fix-null-style-crash'

2020-12-30 23:00:42 +01:00
parent a293be2121 fa381c5493
commit 7de3632c7e
1 changed files with 2 additions and 2 deletions
--- a/Source/Editor/Options/OptionsModule.cs
+++ b/Source/Editor/Options/OptionsModule.cs
@@ -196,9 +196,9 @@ namespace FlaxEditor.Options

            // If a non-default style was chosen, switch to that style
            string styleName = themeOptions.SelectedStyle;
-            if (styleName != "Default" && themeOptions.Styles.ContainsKey(styleName))
+            if (styleName != "Default" && themeOptions.Styles.TryGetValue(styleName, out var style) && style != null)
            {
-                Style.Current = themeOptions.Styles[themeOptions.SelectedStyle];
+                Style.Current = style;
            }
            else
            {