From 771c531125c0dc64ad4804c3a36a39547ef12050 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 29 May 2016 12:22:32 +0200
Subject: [PATCH] Avoid scaling for null pixmaps (results in warnings)

---
 src/blackgui/components/mappingcomponent.cpp |  2 +-
 src/blackgui/overlaymessages.cpp             | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 3628c688f..31c3f7008 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -211,7 +211,7 @@ namespace BlackGui
                 else
                 {
                     QPixmap qpm = pm.pixmap();
-                    if (qpm.height() > MaxHeight)
+                    if (qpm.height() > MaxHeight && !qpm.isNull())
                     {
                         qpm = qpm.scaledToWidth(MaxHeight, Qt::SmoothTransformation);
                     }
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index 00af5abd6..8c3964114 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -167,9 +167,17 @@ namespace BlackGui
         }
 
         this->ui->lbl_Image->setText("");
-        this->ui->lbl_Image->setPixmap(
-            image.scaled(sizeAvailable, Qt::KeepAspectRatio, Qt::FastTransformation)
-        );
+        if (image.isNull())
+        {
+            static const QPixmap e;
+            this->ui->lbl_Image->setPixmap(e);
+        }
+        else
+        {
+            this->ui->lbl_Image->setPixmap(
+                image.scaled(sizeAvailable, Qt::KeepAspectRatio, Qt::FastTransformation)
+            );
+        }
         this->display(timeOutMs);
     }