X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/954e8c47906c12edaaf6e6aebdd41516eceb0d44..d71b617205ce152dedc5d3a5b5b801697741f8eb:/src/panels/information/pixmapviewer.cpp

diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index ddf264982..1f072641e 100644
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -25,7 +25,7 @@ PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_animation.setDuration(150);
-    m_animation.setCurveShape(QTimeLine::LinearCurve);
+    m_animation.setEasingCurve(QEasingCurve::Linear);
 
     if (m_transition != NoTransition) {
         connect(&m_animation, &QTimeLine::valueChanged, this, QOverload<>::of(&PixmapViewer::update));
@@ -136,7 +136,7 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
 
             style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, scaledPixmap);
         }
-    } else {
+    } else if (!m_pixmap.isNull()) {
         style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, m_pixmap);
     }
 }