Fixed numerous crashes with chat and guild windows using new tabbed area.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index c178df18..05fa0953 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -168,8 +168,13 @@ void GuildHandler::handleMessage(MessageIn &msg)
                 // 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);
+                Guild *guild = player_node->getGuild(guildId);
+                if (guild)
+                {
+                    chatWindow->removeChannel(guild->getName());
+                    guildWindow->removeTab(guildId);
+                    player_node->removeGuild(guildId);
+                }
             }
         } break;
     }