#89 Bug Fixes

Author: Taiizor

src/ReaLTaiizor/Manager/MetroStyleManager.cs

@@ -34,6 +34,8 @@ public MetroStyleManager(Form ownerForm)
 
         public MetroStyleManager()
         {
+            Style = Style.Light;
+
             if (_customTheme == null)
             {
                 string themePath = Properties.Settings.Default.ThemeFile;
@@ -54,7 +56,7 @@ public MetroStyleManager()
                     _customTheme = ThemeFilePath(Properties.Resources.Metro_Theme);
                 }
             }
-            Style = Style.Light;
+
             EvaluateDicts();
         }
 
@@ -220,19 +222,19 @@ public string CustomTheme
             get => _customTheme;
             set
             {
-                if (!string.IsNullOrEmpty(value))
+                if (!string.IsNullOrEmpty(value) && File.Exists(value))
                 {
                     Properties.Settings.Default.ThemeFile = value;
                     Properties.Settings.Default.Save();
                     ControlProperties(value);
                     Style = Style.Custom;
+                    _customTheme = value;
                 }
                 else
                 {
                     Style = Style.Light;
+                    _customTheme = null;
                 }
-
-                _customTheme = value;
             }
         }
 
@@ -428,17 +430,24 @@ private void ControlProperties(string path)
 
         private void ThemeDetailsReader(string path)
         {
-            foreach (KeyValuePair<string, object> item in GetValues(path, "Theme"))
+            try
             {
-                if (item.Key == "Name")
-                {
-                    ThemeName = item.Value.ToString();
-                }
-                else if (item.Key == "Author")
+                foreach (KeyValuePair<string, object> item in GetValues(path, "Theme"))
                 {
-                    ThemeAuthor = item.Value.ToString();
+                    if (item.Key == "Name")
+                    {
+                        ThemeName = item.Value.ToString();
+                    }
+                    else if (item.Key == "Author")
+                    {
+                        ThemeAuthor = item.Value.ToString();
+                    }
                 }
             }
+            catch
+            {
+                return;
+            }
         }
 
         private static Dictionary<string, object> GetValues(string path, string nodename)
@@ -468,7 +477,7 @@ private static Dictionary<string, object> GetValues(string path, string nodename
             }
             catch
             {
-                return null;
+                return new();
             }
         }
 

src/ReaLTaiizor/Properties/Settings.Designer.cs

@@ -13,7 +13,7 @@
 //     Creator: Taiizor
 //     Website: www.Vegalya.com
 //     Created: 15.May.2019
-//     Changed: 08.Dec.2022
+//     Changed: 23.Dec.2022
 //     Version: 3.7.8.9
 //
 // |---------DO-NOT-REMOVE---------|

src/ReaLTaiizor/ReaLTaiizor.cs

@@ -294,4 +294,19 @@ Changes are detailed at https://github.com/Taiizor/ReaLTaiizor/releases</Package
         <EmbeddedResource Include="Localization\Poison\zh\PoisonToggle.xml" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Update="Properties\Settings.Designer.cs">
+        <DesignTimeSharedInput>True</DesignTimeSharedInput>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>Settings.settings</DependentUpon>
+      </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Update="Properties\Settings.settings">
+        <Generator>SettingsSingleFileGenerator</Generator>
+        <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      </None>
+    </ItemGroup>
+
 </Project>

src/ReaLTaiizor/ReaLTaiizor.csproj

@@ -40,6 +40,11 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
+        <Compile Update="Properties\Settings.Designer.cs">
+          <DesignTimeSharedInput>True</DesignTimeSharedInput>
+          <AutoGen>True</AutoGen>
+          <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
     </ItemGroup>
 
     <ItemGroup>
@@ -49,4 +54,11 @@
         </EmbeddedResource>
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="Properties\Settings.settings">
+        <Generator>SettingsSingleFileGenerator</Generator>
+        <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      </None>
+    </ItemGroup>
+
 </Project>