3 files changed, 12 insertions, 11 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 ++;
     }
 }
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d73212d48..0b40d8c01 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/setup.h"
 
+#include "chatwindow.h"
 #include "configuration.h"
 #include "game.h"
 #include "main.h"
@@ -149,6 +150,8 @@ void Setup::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Store")
     {
+        if (chatWindow)
+            chatWindow->saveState();
         config.write();
         serverConfig.write();
     }
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 748e038e2..5ac6721a5 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -366,8 +366,10 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
     {
         if (ava->getType() == AVATAR_PLAYER && chatWindow)
         {
-            chatWindow->addWhisperTab(model->getAvatarAt(selected)
-                                      ->getName(), true);
+            ChatTab *tab = chatWindow->addWhisperTab(
+                model->getAvatarAt(selected)->getName(), true);
+            if (chatWindow && tab)
+                chatWindow->saveState();
         }
     }
 }