Fix a very obscure previews-in-tooltip bug.

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

diff --git a/src/tooltipmanager.cpp b/src/tooltipmanager.cpp
index d222175e0d6149eb9063ec42bca80780f547497a..c8632daf6ab248e417c7754b81cc4d90f0395006 100644 (file)
--- a/src/tooltipmanager.cpp
+++ b/src/tooltipmanager.cpp
@@ -161,7 +161,9 @@ void ToolTipManager::prepareToolTip()
         if (m_preview && m_previewIsLate) {
             // We got a preview, but it is late, the tooltip has already been shown.
             // So update the tooltip directly.
         if (m_preview && m_previewIsLate) {
             // We got a preview, but it is late, the tooltip has already been shown.
             // So update the tooltip directly.

-            m_emptyRenderedKToolTipItem->setData(Qt::DecorationRole, KIcon(m_pix));
+            if (m_emptyRenderedKToolTipItem != 0) {
+                m_emptyRenderedKToolTipItem->setData(Qt::DecorationRole, KIcon(m_pix));
+            }

             return;
         }
 
             return;
         }
 


@@ -185,6 +187,8 @@ void ToolTipManager::showToolTip(KToolTipItem* tip)
     if (QApplication::mouseButtons() & Qt::LeftButton) {
         delete tip;
         tip = 0;
     if (QApplication::mouseButtons() & Qt::LeftButton) {
         delete tip;
         tip = 0;

+        // m_emptyRenderedKToolTipItem is an alias for tip.
+        m_emptyRenderedKToolTipItem = 0;

         return;
     }
     
         return;
     }