From e7fa1caf6c6bdee33ee7adda52ea923150ec17f4 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Fri, 3 Apr 2026 22:11:57 +0800
Subject: [PATCH] Update SettingsWindow2.xaml

---
 Ink Canvas/Helpers/PPTManager.cs                   | 14 +++++++++-----
 .../Windows/SettingsViews2/SettingsWindow2.xaml    |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/Helpers/PPTManager.cs b/Ink Canvas/Helpers/PPTManager.cs
index 86922667..a02c3371 100644
--- a/Ink Canvas/Helpers/PPTManager.cs	
+++ b/Ink Canvas/Helpers/PPTManager.cs	
@@ -390,11 +390,15 @@ namespace Ink_Canvas.Helpers
                             {
                                 try
                                 {
-                                    PPTApplication.PresentationOpen -= OnPresentationOpen;
-                                    PPTApplication.PresentationClose -= OnPresentationClose;
-                                    PPTApplication.SlideShowBegin -= OnSlideShowBegin;
-                                    PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
-                                    PPTApplication.SlideShowEnd -= OnSlideShowEnd;
+                                    // 再次检查PPTApplication是否为null，因为可能在异步操作期间被修改
+                                    if (PPTApplication != null && Marshal.IsComObject(PPTApplication))
+                                    {
+                                        PPTApplication.PresentationOpen -= OnPresentationOpen;
+                                        PPTApplication.PresentationClose -= OnPresentationClose;
+                                        PPTApplication.SlideShowBegin -= OnSlideShowBegin;
+                                        PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
+                                        PPTApplication.SlideShowEnd -= OnSlideShowEnd;
+                                    }
                                 }
                                 catch (COMException comEx)
                                 {
diff --git a/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml b/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml
index c26545fc..4b178c43 100644
--- a/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml	
+++ b/Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml	
@@ -22,6 +22,11 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources />
             </ResourceDictionary.MergedDictionaries>
+            <!--  L-Pattern Overwriting resources  -->
+            <Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
+            <Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
+            <CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
+            <Thickness x:Key="NavigationViewHeaderMargin">56,34,0,0</Thickness>
         </ResourceDictionary>
     </Window.Resources>