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

List:       kde-commits
Subject:    KDE/kdebase/kicker/kicker/core
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2006-02-23 22:51:01
Message-ID: 1140735061.111890.22201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 512917 by aseigo:

ensure we remove config files behind us


 M  +7 -3      container_applet.cpp  


--- trunk/KDE/kdebase/kicker/kicker/core/container_applet.cpp #512916:512917
@@ -254,14 +254,18 @@
 {
     BaseContainer::slotRemoved(config);
 
+    // we must delete the applet first since it may write out a config file
+    // in its dtor which can foil out plans to remove it's config file below
+    delete _applet;
+    _applet = 0;
+
     if (_configFile.isEmpty() ||
-        _info.isUniqueApplet() ||
-        !QFile::exists(locate("config", _configFile)))
+        _info.isUniqueApplet())
     {
         return;
     }
 
-    QFile::remove(locate("config", _configFile));
+    QFile::remove(locateLocal("config", _configFile));
 }
 
 void AppletContainer::activateWindow()
[prev in list] [next in list] [prev in thread] [next in thread]