From kde-commits  Fri Sep 17 11:28:17 2010
From: Peter Penz <peter.penz19 () gmail ! com>
Date: Fri, 17 Sep 2010 11:28:17 +0000
To: kde-commits
Subject: KDE/kdelibs/kfile
Message-Id: <20100917112817.386D4AC888 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128472258701318

SVN commit 1176328 by ppenz:

Applications may not delete the directory model before deleting the KFilePreviewGenerator instance. However it is very easy for applications to violate this, so instead of crashing provide a warning for the application developer. Thanks a lot to Sebastian Sauer for the investigations and the patch!

CCBUG: 196681


 M  +7 -1      kfilepreviewgenerator.cpp  


--- trunk/KDE/kdelibs/kfile/kfilepreviewgenerator.cpp #1176327:1176328
@@ -357,7 +357,7 @@
     QTimer* m_iconUpdateTimer;
     QTimer* m_scrollAreaTimer;
     QList<KJob*> m_previewJobs;
-    KDirModel* m_dirModel;
+    QPointer<KDirModel> m_dirModel;
     QAbstractProxyModel* m_proxyModel;
 
     /**
@@ -648,6 +648,12 @@
 
 void KFilePreviewGenerator::Private::updateCutItems()
 {
+    if (m_dirModel == 0) {
+        // see bug #196681
+        qWarning() << "KDirModel has been deleted before deleting KFilePreviewGenerator.";
+        return;
+    }
+
     DataChangeObtainer obt(this);
     clearCutItemsCache();