From 0586006f0186cd2a224fd477d54aa464e0987ce7 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Wed, 1 Mar 2023 14:49:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DApplication.Current.Sh?=
 =?UTF-8?q?utdown=E6=96=B9=E6=B3=95=E5=85=B3=E9=97=AD=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=AA=97=E5=8F=A3=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/SettingsViewModel.cs  | 6 +++---
 src/MaaWpfGui/Main/TaskQueueViewModel.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 8ef7c70739..afafbd3245 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -2181,7 +2181,7 @@ namespace MaaWpfGui
                     if (SaveGUIParametersOnClosing)
                     {
                         Application.Current.MainWindow.Closing += SaveGUIParameters;
-                        Application.Current.Exit += SaveGUIParameters;
+                        Application.Current.MainWindow.Closed += SaveGUIParameters;
                     }
                     else
                     {
@@ -2206,12 +2206,12 @@ namespace MaaWpfGui
                 if (value)
                 {
                     Application.Current.MainWindow.Closing += SaveGUIParameters;
-                    Application.Current.Exit += SaveGUIParameters;
+                    Application.Current.MainWindow.Closed += SaveGUIParameters;
                 }
                 else
                 {
                     Application.Current.MainWindow.Closing -= SaveGUIParameters;
-                    Application.Current.Exit -= SaveGUIParameters;
+                    Application.Current.MainWindow.Closed -= SaveGUIParameters;
                 }
             }
         }
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index 32dcdeffad..9d25bb07db 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -129,7 +129,7 @@ namespace MaaWpfGui
             if (_settingsViewModel.LoadGUIParameters && _settingsViewModel.SaveGUIParametersOnClosing)
             {
                 Application.Current.MainWindow.Closing += _settingsViewModel.SaveGUIParameters;
-                Application.Current.Exit += _settingsViewModel.SaveGUIParameters;
+                Application.Current.MainWindow.Closed += _settingsViewModel.SaveGUIParameters;
             }
         }