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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kio/kio
From:       Michael Brade <brade () kde ! org>
Date:       2005-12-07 3:03:36
Message-ID: 1133924616.134639.4779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 486205 by brade:

no need for this anymore, Kicker doesn't crash anymore, so don't leak either
anymore.


 M  +3 -7      kdirlister.cpp  


--- branches/KDE/3.5/kdelibs/kio/kio/kdirlister.cpp #486204:486205
@@ -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,12 +814,8 @@
 
 KDirListerCache* KDirListerCache::self()
 {
-  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;
-  }
+  if ( !s_pSelf )
+    s_pSelf = sd_KDirListerCache.setObject( s_pSelf, new KDirListerCache );
 
   return s_pSelf;
 }
[prev in list] [next in list] [prev in thread] [next in thread]