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

List:       kde-commits
Subject:    new_kcm_code: kdelibs/kutils
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-10-17 15:11:47
Message-ID: 20041017151147.D406516C2F () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 

Don't leak KCMError(d->kcm) when two modules are listening on an occupier, and the \
other module gets loaded when the occupier closes.


  M +6 -3      kcmoduleproxy.cpp   1.2.2.6


--- kdelibs/kutils/kcmoduleproxy.cpp  #1.2.2.5:1.2.2.6
@@ -252,5 +252,10 @@ KCModule * KCModuleProxy::realModule() c
         else
         {
-                kdDebug(711) << "Module already loaded" << endl;
+                kdDebug(711) << "Module already loaded, loading KCMError" << endl;
+
+                /* If two modules were listening, and not this but the other module
+                 * started loading, that means we create a new KCMError to mention
+                 * the new occupier, and that we can't leak the previous KCMError. \
*/ +                delete d->kcm;
 
                 d->dcopClient->detach();
@@ -465,6 +470,4 @@ void KCModuleProxy::showEvent( QShowEven
         ( void )realModule();
         QWidget::showEvent( ev );
-        dumpObjectInfo(); // TODO
-        dumpObjectTree();
 }
 


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