fix: 修复了一个变换版本后回循环使用上一次用户设置导致保存失效的bug

Hikarisame-Technology · Oct 18, 2024 · 0afc758 · 0afc758
1 parent ea88a80
commit 0afc758
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/SYSTools/MainWindow.xaml.cs b/SYSTools/MainWindow.xaml.cs
@@ -143,9 +143,10 @@ private void NavigateTo(Type navPageType, NavigationTransitionInfo transitionInf
 
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            // 随时升级配置文件并保存到最新版本
-            Properties.Settings.Default.Upgrade();
-            Properties.Settings.Default.Save();
+            if (!System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.PerUserRoamingAndLocal).HasFile)
+                Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.Save();
+                LoadUserSettings();
             // 加载用户配置
             LoadUserSettings();
         }

diff --git a/SYSTools/Pages/Configuration.xaml.cs b/SYSTools/Pages/Configuration.xaml.cs
@@ -18,10 +18,6 @@ public Configuration()
         {
             InitializeComponent();
             LoadUserSettings();
-            GlobalSettings.Instance.BackgroundImageBlurRadius = Properties
-                .Settings
-                .Default
-                .BackgroundImageBlurRadius;
             DataContext = this;
         }
 
@@ -74,9 +70,12 @@ private void LoadBackgroundImage(string imagePath)
         private void LoadUserSettings()
         {
             string savedImagePath = Properties.Settings.Default.BackgroundImagePath;
+            double savedBlurRadius = Properties.Settings.Default.BackgroundImageBlurRadius;
             if (!string.IsNullOrWhiteSpace(savedImagePath) && File.Exists(savedImagePath))
             {
                 LoadBackgroundImage(savedImagePath);
+                GlobalSettings.Instance.BackgroundImageBlurRadius = savedBlurRadius;
+                GlobalSettings.Instance.BackgroundImagePath = savedImagePath;
             }
         }
     }