Fix saving opened tabs state.

1 files changed, 5 insertions, 9 deletions

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index c266374ef..1ef3139db 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -215,6 +215,7 @@ ChatWindow::ChatWindow():
 
 ChatWindow::~ChatWindow()
 {
+    saveState();
     config.setValue("ReturnToggles", mReturnToggles);
     removeAllWhispers();
     delete mItemLinkHandler;
@@ -935,7 +936,11 @@ void ChatWindow::whisper(const std::string &nick,
     if (i != mWhispers.end())
         tab = i->second;
     else if (config.getBoolValue("whispertab"))
+    {
         tab = addWhisperTab(nick);
+        if (tab)
+            saveState();
+    }
 
     if (tab)
     {
@@ -1414,15 +1419,6 @@ void ChatWindow::loadState()
             tab->setRemoveNames((flags & 2) / 2);
             tab->setNoAway((flags & 4) / 4);
         }
-        serverConfig.deleteKey("chatWhisper" + toString(num));
-        serverConfig.deleteKey("chatWhisperFlags" + toString(num));
-        num ++;
-    }
-
-    while (num < 50)
-    {
-        serverConfig.deleteKey("chatWhisper" + toString(num));
-        serverConfig.deleteKey("chatWhisperFlags" + toString(num));
         num ++;
     }
 }