From a31b836479a1df2138fb4cc295db2f2a4fb97ed8 Mon Sep 17 00:00:00 2001 From: Michael Reeves Date: Sun, 3 Aug 2014 10:48:21 +0200 Subject: [PATCH] Fix warning on launch "QPixmap::scaled: Pixmap is a null pixmap" If Dolphin is launched with the information panel on and set to display previews, PixmapViewer::paintEvent is called three times before any pixmap is set. Each time the above warning message is output. REVIEW: 119553 FIXED-IN: 4.14.0 --- src/panels/information/pixmapviewer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp index 8a752c5876..45a8c17e22 100644 --- a/src/panels/information/pixmapviewer.cpp +++ b/src/panels/information/pixmapviewer.cpp @@ -102,11 +102,13 @@ void PixmapViewer::paintEvent(QPaintEvent* event) const bool useOldPixmap = (m_transition == SizeTransition) && (m_oldPixmap.width() > m_pixmap.width()); const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap; - const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth, - scaledHeight, - Qt::IgnoreAspectRatio, - Qt::FastTransformation); - painter.drawPixmap(x, y, scaledPixmap); + if (!largePixmap.isNull()) { + const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth, + scaledHeight, + Qt::IgnoreAspectRatio, + Qt::FastTransformation); + painter.drawPixmap(x, y, scaledPixmap); + } } else { const int x = (width() - m_pixmap.width() ) / 2; const int y = (height() - m_pixmap.height()) / 2;