From c1e599971efd85fafb7fea5c5e9d6dc3f2723e92 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 30 Apr 2026 16:55:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=80=E5=87=BA=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml.cs                   | 10 ++++++++--
 Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 84d78706..bd021fc6 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -1519,6 +1519,7 @@ namespace Ink_Canvas
 
         private bool _allowCloseAfterExitVerification;
         private bool _isExitVerificationInProgress;
+        private bool _forceCloseFromExitOrRestartButton;
 
         /// <summary>
         /// 处理主窗口的关闭流程：记录关闭事件，按需进行退出密码验证或多次确认并据此取消或允许关闭。
@@ -1541,14 +1542,15 @@ namespace Ink_Canvas
                 return;
             }
 
-            if (BtnPPTSlideShowEnd != null && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+            if (!_forceCloseFromExitOrRestartButton &&
+                BtnPPTSlideShowEnd != null && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
             {
                 e.Cancel = true;
                 BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
                 LogHelper.WriteLogToFile("Ink Canvas closing converted to exit PPT", LogHelper.LogType.Event);
                 return;
             }
-            if (currentMode != 0)
+            if (!_forceCloseFromExitOrRestartButton && currentMode != 0)
             {
                 e.Cancel = true;
                 CloseWhiteboardImmediately();
@@ -1580,6 +1582,7 @@ namespace Ink_Canvas
                             bool ok = await SecurityManager.PromptAndVerifyAsync(Settings, this, "退出验证", "请输入安全密码以退出软件。");
                             if (!ok)
                             {
+                                _forceCloseFromExitOrRestartButton = false;
                                 LogHelper.WriteLogToFile("Ink Canvas closing cancelled by security password", LogHelper.LogType.Event);
                                 return;
                             }
@@ -1610,6 +1613,7 @@ namespace Ink_Canvas
 
                 if (result1 == MessageBoxResult.Cancel)
                 {
+                    _forceCloseFromExitOrRestartButton = false;
                     e.Cancel = true;
                     LogHelper.WriteLogToFile("Ink Canvas closing cancelled at first confirmation", LogHelper.LogType.Event);
                     return;
@@ -1621,6 +1625,7 @@ namespace Ink_Canvas
 
                 if (result2 == MessageBoxResult.Cancel)
                 {
+                    _forceCloseFromExitOrRestartButton = false;
                     e.Cancel = true;
                     LogHelper.WriteLogToFile("Ink Canvas closing cancelled at second confirmation", LogHelper.LogType.Event);
                     return;
@@ -1632,6 +1637,7 @@ namespace Ink_Canvas
 
                 if (result3 == MessageBoxResult.Cancel)
                 {
+                    _forceCloseFromExitOrRestartButton = false;
                     e.Cancel = true;
                     LogHelper.WriteLogToFile("Ink Canvas closing cancelled at final confirmation", LogHelper.LogType.Event);
                     return;
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 3d9c04fc..514fdac3 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -3059,6 +3059,7 @@ namespace Ink_Canvas
                 LogHelper.WriteLogToFile($"停止PPT监控时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
+            _forceCloseFromExitOrRestartButton = true;
             App.IsAppExitByUser = true;
             // 不设置 CloseIsFromButton = true，让它也经过确认流程
             Close();
@@ -3072,6 +3073,7 @@ namespace Ink_Canvas
         public void BtnRestart_Click(object sender, RoutedEventArgs e)
         {
             Process.Start(System.Windows.Forms.Application.ExecutablePath, "-m");
+            _forceCloseFromExitOrRestartButton = true;
             App.IsAppExitByUser = true;
             // 不设置 CloseIsFromButton = true，让它也经过确认流程
             Close();