[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2005-12-05 8:52:29
Message-ID: 1133772749.136492.3999.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 485641 by dfaure:

A crash on every logout is rather annoying, let's do something about it.


 M  +7 -3      kdirlister.cpp  


--- branches/KDE/3.5/kdelibs/kio/kio/kdirlister.cpp #485640:485641
@@ -39,7 +39,7 @@
 #include <assert.h>
 
 KDirListerCache* KDirListerCache::s_pSelf = 0;
-static KStaticDeleter<KDirListerCache> sd_KDirListerCache;
+//static KStaticDeleter<KDirListerCache> sd_KDirListerCache;
 
 // Enable this to get printDebug() called often, to see the contents of the cache
 //#define DEBUG_CACHE
@@ -814,8 +814,12 @@
 
 KDirListerCache* KDirListerCache::self()
 {
-  if ( !s_pSelf )
-    s_pSelf = sd_KDirListerCache.setObject( s_pSelf, new KDirListerCache );
+  if ( !s_pSelf ) {
+    // KStaticDeleter disabled currently, to avoid kicker crash on logout, due to
+    // KDirListerCache deleted before the KDirLister instances.
+    //s_pSelf = sd_KDirListerCache.setObject( s_pSelf, new KDirListerCache );
+    s_pSelf = new KDirListerCache;
+  }
 
   return s_pSelf;
 }
[prev in list] [next in list] [prev in thread] [next in thread]