From 25b0233d54a6d4bea457fd843073e57183d8bea0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 23 Oct 2004 11:40:59 +0000
Subject: global settings bugfixes

---
(limited to 'pwmanager')

diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index fdc34e0..68d5b68 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -31,7 +31,7 @@
 #include "pwmprefs.h"
 
 PWMPrefs *PWMPrefs::sInstance = 0;
-static KStaticDeleter<PWMPrefs> staticDeleter;
+static KStaticDeleter<PWMPrefs> staticDeleterPP;
 
 PWMPrefs::PWMPrefs()
   : KPimPrefs("pwmanagerrc")
@@ -68,17 +68,21 @@ PWMPrefs::PWMPrefs()
 }
 
 PWMPrefs::~PWMPrefs()
-{
+{  
+    if (sInstance == this)
+        sInstance = staticDeleterPP.setObject(0); 
+    else
+        qDebug("Whats this? Error in PWMPrefs::~PWMPrefs()?");
 }
 
 PWMPrefs *PWMPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef PWM_EMBEDDED
-    sInstance = staticDeleter.setObject( new PWMPrefs() );
+    sInstance = staticDeleterPP.setObject( new PWMPrefs() );
 #else  //PWM_EMBEDDED
     //US the following line has changed ???. Why
-    staticDeleter.setObject( sInstance, new PWMPrefs() );
+    staticDeleterPP.setObject( sInstance, new PWMPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
--
cgit v0.9.0.2