From 33e5b55b7e48b3a1f68ef66ddf49be05e6dda47f Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Tue, 3 Apr 2018 14:28:37 +0200
Subject: Check if the movie's current pixmap is null before drawing it

Change-Id: I87ed9998108961775f8f424bfbb4b957c0b03d8a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 src/widgets/widgets/qlabel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 046acfeea9..947da273dd 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -1008,7 +1008,7 @@ void QLabel::paintEvent(QPaintEvent *)
                                                        : layoutDirection(), QFlag(d->align));
 
 #if QT_CONFIG(movie)
-    if (d->movie) {
+    if (d->movie && !d->movie->currentPixmap().isNull()) {
         if (d->scaledcontents)
             style->drawItemPixmap(&painter, cr, align, d->movie->currentPixmap().scaled(cr.size()));
         else
-- 
cgit v1.2.3