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 @@
+
+ 0,48,0,0
+ 1,1,0,0
+ 8,0,0,0
+ 56,34,0,0