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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Isaac Clerencia <isaac () warp ! es>
Date:       2007-06-18 23:38:58
Message-ID: 1182209938.545718.11893.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 677348 by isaac:

Fix crash when exiting from kmail

GlobalSettingsBase was being deleted twice, once
by the KStaticDeleter and another one by the K_STATIC_GLOBAL code
generated by kconfig_compiler. No longer use KStaticDeleter in
globalsettings.cpp as K_STATIC_GLOBAL already takes care of
deleting it



 M  +1 -2      globalsettings.cpp  
 M  +1 -2      globalsettings.h  


--- trunk/KDE/kdepim/kmail/globalsettings.cpp #677347:677348
@@ -28,12 +28,11 @@
 #include <QTimer>
 
 GlobalSettings *GlobalSettings::mSelf = 0;
-static KStaticDeleter<GlobalSettings> staticGlobalSettingsDeleter;
 
 GlobalSettings *GlobalSettings::self()
 {
   if ( !mSelf ) {
-    staticGlobalSettingsDeleter.setObject( mSelf, new GlobalSettings() );
+    mSelf = new GlobalSettings();
     mSelf->readConfig();
   }
 
--- trunk/KDE/kdepim/kmail/globalsettings.h #677347:677348
@@ -32,8 +32,6 @@
 {
   Q_OBJECT
 public:
-  virtual ~GlobalSettings();
-
   static GlobalSettings *self();
 
   /** Call this slot instead of directly @ref KConfig::sync() to
@@ -48,6 +46,7 @@
 
 private:
   GlobalSettings();
+  virtual ~GlobalSettings();
   static GlobalSettings *mSelf;
 
   QTimer *mConfigSyncTimer;
[prev in list] [next in list] [prev in thread] [next in thread]