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

List:       kde-commits
Subject:    kdelibs/kutils
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-03-08 12:26:20
Message-ID: 20050308122620.1214E103CB () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Don't crash: clean up in the proper order.


  M +4 -5      kcmoduleproxy.cpp   1.14


--- kdelibs/kutils/kcmoduleproxy.cpp  #1.13:1.14
@@ -81,11 +81,11 @@ class KCModuleProxy::KCModuleProxyPrivat
                 ~KCModuleProxyPrivate()
                 {
+                        delete rootInfo; // Delete before embedWidget!
+                        delete embedWidget; // Delete before embedFrame!
                         delete embedFrame;
                         delete dcopClient;
                         delete dcopObject;
-                        delete embedWidget;
                         delete rootCommunicator;
                         delete rootProcess;
-                        delete rootInfo;
                         delete kcm;
                 }
@@ -387,9 +387,8 @@ void KCModuleProxy::runAsRoot()
 
         /* Clean up in case of failure */
-        delete d->embedFrame;
-        d->embedFrame = 0;
         delete d->embedWidget;
         d->embedWidget = 0;
-        delete lblBusy;
+        delete d->embedFrame;
+        d->embedFrame = 0;
 
         QApplication::restoreOverrideCursor();


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