Preview generators might send a null image, so show the default icon as fallback.

BUG: 196277

svn path=/trunk/KDE/kdebase/apps/; revision=984359

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index 489c6c2b69d5b657c08ebdcdaf4d3c6e9dd41501..67fbf2946b6aa4e382e50ff739617a2f8090b875 100644 (file)
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -276,7 +276,7 @@ void ToolTipManager::startPreviewJob()
 void ToolTipManager::setPreviewPix(const KFileItem& item,
                                    const QPixmap& pixmap)
 {
 void ToolTipManager::setPreviewPix(const KFileItem& item,
                                    const QPixmap& pixmap)
 {

-    if (m_item.url() != item.url()) {
+    if ((m_item.url() != item.url()) || pixmap.isNull()) {

         m_generatingPreview = false;
         return;
     }
         m_generatingPreview = false;
         return;
     }