From ed58873a82790fb1395e1199d87b67f486cd2f0c Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Sat, 8 Nov 2025 19:02:37 +0800
Subject: [PATCH] fix:issue #272

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 41 ++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index b9fc064d..19a7f287 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -667,7 +667,23 @@ namespace Ink_Canvas
 
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    var activePresentation = _pptManager?.GetCurrentActivePresentation();
+                    Presentation activePresentation = null;
+                    int currentSlide = 0;
+                    int totalSlides = 0;
+
+                    if (wn?.View != null && wn.Presentation != null)
+                    {
+                        activePresentation = wn.Presentation;
+                        currentSlide = wn.View.CurrentShowPosition;
+                        totalSlides = activePresentation.Slides.Count;
+                    }
+                    else
+                    {
+                        activePresentation = _pptManager?.GetCurrentActivePresentation();
+                        currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
+                        totalSlides = _pptManager?.SlidesCount ?? 0;
+                    }
+
                     if (activePresentation != null)
                     {
                         if (Settings.PowerPointSettings.IsSupportWPS)
@@ -691,8 +707,6 @@ namespace Ink_Canvas
                     }
 
                     // 更新UI状态
-                    var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
-                    var totalSlides = _pptManager?.SlidesCount ?? 0;
                     _pptUIManager?.UpdateSlideShowStatus(true, currentSlide, totalSlides);
 
                     // 设置浮动栏透明度和边距
@@ -807,20 +821,19 @@ namespace Ink_Canvas
             {
                 Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    var activePresentation = _pptManager?.GetCurrentActivePresentation();
-                    if (activePresentation != null)
+                    if (wn?.View == null || wn.Presentation == null)
                     {
-                        if (Settings.PowerPointSettings.IsSupportWPS)
-                        {
-                        }
-                        else
-                        {
-                            _multiPPTInkManager?.SwitchToPresentation(activePresentation);
-                        }
+                        return;
                     }
 
-                    var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
-                    var totalSlides = _pptManager?.SlidesCount ?? 0;
+                    var currentSlide = wn.View.CurrentShowPosition;
+                    var activePresentation = wn.Presentation;
+                    var totalSlides = activePresentation.Slides.Count;
+
+                    if (!Settings.PowerPointSettings.IsSupportWPS)
+                    {
+                        _multiPPTInkManager?.SwitchToPresentation(activePresentation);
+                    }
 
                     // 使用防抖机制处理页面切换
                     HandleSlideSwitchWithDebounce(currentSlide, totalSlides);