From fabc9567b86e5e6a9b7b463f47869fc13e7ae33b Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Tue, 1 Apr 2008 17:13:32 +0000
Subject: Fixed up chat and guilds

---
 src/net/guildhandler.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/net/guildhandler.cpp')

diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index 0b36f8e4..70529121 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -140,7 +140,11 @@ void GuildHandler::handleMessage(MessageIn &msg)
 
             if (msg.readInt8() == ERRMSG_OK)
             {
-                guildWindow->removeTab();
+                // Must remove tab first, as it wont find the guild
+                // name after its removed from the player
+                int guildId = msg.readInt16();
+                guildWindow->removeTab(guildId);
+                player_node->removeGuild(guildId);
             }
         } break;
     }
-- 
cgit v1.2.3-70-g09d2