1 files changed, 13 insertions, 3 deletions
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ce1043719168..6bb05bb874f6 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -370,25 +370,35 @@ void LOKSlideRenderer::renderNextLayer(unsigned char* pBuffer)
 {
     OSL_ASSERT(pBuffer);
 
+    msLastJsonMessage = ""_ostr;
+    mbIsBitmapLayer = false;
+
     if (mbRenderBackground && !isBackgroundRenderingDone())
+    {
         renderBackground(pBuffer);
+        if (!msLastJsonMessage.isEmpty())
+            return;
+    }
 
     if (!isTextFieldsRenderingDone())
     {
         renderTextFields(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     if (mbRenderMasterPageObjects && !isMasterPageRenderingDone())
     {
         renderMasterPage(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     if (!isDrawPageRenderingDone())
     {
         renderDrawPage(pBuffer);
-        return;
+        if (!msLastJsonMessage.isEmpty())
+            return;
     }
 
     mbSlideRenderingDone = true;