Fix: check the frame bounds after calling loadFile

pencil2d · Jul 3, 2020 · 6dc848a · 6dc848a
1 parent b11aa67
commit 6dc848a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/core_lib/src/canvaspainter.cpp b/core_lib/src/canvaspainter.cpp
@@ -304,12 +304,6 @@ void CanvasPainter::paintBitmapFrame(QPainter& painter,
         paintedImage = bitmapLayer->getBitmapImageAtFrame(nFrame);
     }
 
-    if ((paintedImage == nullptr || paintedImage->bounds().isEmpty())
-        && !(isCurrentFrame && mBuffer != nullptr && !mBuffer->bounds().isEmpty()))
-    {
-        return;
-    }
-
     if (paintedImage == nullptr)
     {
         paintedImage = new BitmapImage;
@@ -318,6 +312,15 @@ void CanvasPainter::paintBitmapFrame(QPainter& painter,
     paintedImage->loadFile(); // Critical! force the BitmapImage to load the image
     CANVASPAINTER_LOG("        Paint Image Size: %dx%d", paintedImage->image()->width(), paintedImage->image()->height());
 
+    const bool frameIsEmpty = (paintedImage == nullptr || paintedImage->bounds().isEmpty());
+    const bool isDrawing = isCurrentFrame && mBuffer && !mBuffer->bounds().isEmpty();
+
+    if (frameIsEmpty && !isDrawing)
+    {
+        CANVASPAINTER_LOG("        Early return frame %d, %d", frameIsEmpty, isDrawing);
+        return;
+    }
+
     BitmapImage paintToImage;
     paintToImage.paste(paintedImage);