#i118879# Prevent SlideshowImpl from being destroyed in the midle of PostYieldListener.

1 files changed, 11 insertions, 1 deletions

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 71090c98fb11..c802bb531341 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1907,10 +1907,20 @@ IMPL_LINK( SlideshowImpl, PostYieldListener, void*, EMPTYARG )
 {
     Application::EnableNoYieldMode(false);
     Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+
     if (mbDisposed)
         return 0;
+
+    // Call Reschedule() but make sure that we are not destroyed during its
+    // execution (we still can be disposed, though.)
+    const rtl::Reference<SlideshowImpl> pSelf (this);
     Application::Reschedule(true);
-    return updateSlideShow();
+
+    // Update the slide show if we are still alive.
+    if ( ! mbDisposed)
+        return updateSlideShow();
+    else
+        return 0;
 }