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

List:       kde-commits
Subject:    extragear/network/konversation/src
From:       Eli MacKenzie <argonel () sympatico ! ca>
Date:       2009-09-21 0:48:27
Message-ID: 1253494107.691364.11178.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1026186 by argonel:

only save prefs if there is a mainWindow object

CCBUG: 204970

 M  +8 -5      application.cpp  


--- trunk/extragear/network/konversation/src/application.cpp #1026185:1026186
@@ -60,10 +60,13 @@
 
 Application::~Application()
 {
-    kDebug();
-    stashQueueRates();
-    Preferences::self()->writeConfig();
-    saveOptions(false);
+    kDebug() << bool(mainWindow != 0);
+    if (mainWindow) // only save the config of the instance which made the main \
window +    {
+        stashQueueRates();
+        Preferences::self()->writeConfig(); // FIXME i can't figure out why this \
isn't in saveOptions --argonel +        saveOptions(false);
+    }
 
     // Delete m_dccTransferManager here as its destructor depends on the main loop \
being in tact which it  // won't be if if we wait till Qt starts deleting parent \
pointers. @@ -81,7 +84,7 @@
 int Application::newInstance()
 {
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    QString url; //TODO FIXME: does this really have to be a QCString?
+    QString url;
     if (args->count() > 0)
         url = args->arg(0);
 


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