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

List:       kde-commits
Subject:    kdenetwork/kopete/libkopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-04-27 12:08:53
Message-ID: 20050427120853.DE1DF630 () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Make sure PluginManager::shotdown() is called only once


  M +8 -4      kopetepluginmanager.cpp   1.45


--- kdenetwork/kopete/libkopete/kopetepluginmanager.cpp  #1.44:1.45
@@ -162,5 +162,12 @@ KPluginInfo *PluginManager::pluginInfo( 
 void PluginManager::shutdown()
 {
-//      kdDebug( 14010 ) << k_funcinfo << kdBacktrace() << endl;
+        if(d->shutdownMode != Private::Running)
+        {
+                kdDebug( 14010 ) << k_funcinfo << "called when not running.  / state \
= " << d->shutdownMode << endl; +                return;
+        }
+
+        d->shutdownMode = Private::ShuttingDown;
+        
 
         /* save the contact list now, just in case a change was made very recently
@@ -172,7 +179,4 @@ void PluginManager::shutdown()
         Kopete::AccountManager::self()->save();
         
-        
-        d->shutdownMode = Private::ShuttingDown;
-        
         // Remove any pending plugins to load, we're shutting down now :)
         d->pluginsToLoad.clear();


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