From 2fa27d6f837a5624ec49ff904ad880d9c8f317e6 Mon Sep 17 00:00:00 2001 From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com> Date: Sat, 31 May 2025 16:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BA=86PPT=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E5=8F=AF=E7=94=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_PPT.cs | 10 ++++++++-- ...vasForClass.csproj.AssemblyReference.cache | Bin 35040 -> 34776 bytes 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index ed6928bf..751f7a69 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -80,7 +80,6 @@ namespace Ink_Canvas { public static bool IsShowingRestoreHiddenSlidesWindow = false; private static bool IsShowingAutoplaySlidesWindow = false; - private static bool hasLoggedPresentationWarning = false; private bool isPowerPointInitialized = false; @@ -112,12 +111,18 @@ namespace Ink_Canvas { pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B"))); } - isPowerPointInitialized = true; + return; } + + if (pptApplication != null) { + // 检查是否有活动演示文稿 + if (pptApplication.Presentations.Count == 0 || pptApplication.ActivePresentation == null) + return; // 退出方法,避免后续代码执行 + isPowerPointInitialized = false; timerCheckPPT.Stop(); //获得演示文稿对象 presentation = pptApplication.ActivePresentation; @@ -152,6 +157,7 @@ namespace Ink_Canvas { Application.Current.Dispatcher.Invoke(() => { PptApplication_PresentationOpen(null); }); + //如果检测到已经开始放映,则立即进入画板模式 if (pptApplication.SlideShowWindows.Count >= 1) { diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 491d60f44290cc44779b1ec51e1ffa829d8ebff0..702ba8caef3f5617c0f5c391848f904e06c4d44e 100644 GIT binary patch delta 93 zcmaDbk?BT1(*`9*j+YGoH%l(K%P~2hO?q+yizp+*Q`0J1tH6#xJL delta 285 zcmcc7&-7p-(*`9*jt!IR|K6W}mt*pNR_V!{ETT+|VUrtMyVrCwQtqT&$%T{ns%qvSQ*7tOD&M%sLAw+9)17ivkN6!tYneUinA!bH^%rqs@ zOrQM3l+>ch7eh2BH!${XzQl5ek*)qe$mq#i*p!5s7#J8B>wyGI1CRlv8N)%gn2=~o PcxIkk1l*F@?6wU6p2J@t