diff options
| author | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 19:28:36 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <mana@crushnet.org> | 2010-02-24 19:28:36 +0100 |
| commit | 48131e2ecfa4d52375d890dac80f9ab1ad45ccf0 (patch) | |
| tree | 0c973f354d827880cdab7a8bab8fa1357e9f97ec /src/net/ea/generalhandler.cpp | |
| parent | a5e26a9b9a8cab9feeaaa175aa4883913c3ff9d3 (diff) | |
| parent | f6d50d0cbe12f8799e6fec844816defc8711df37 (diff) | |
| download | mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.gz mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.bz2 mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.xz mana-client-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/net/ea/generalhandler.cpp')
| -rw-r--r-- | src/net/ea/generalhandler.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index f7d495a6..6ca853fb 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -49,6 +49,7 @@ #include "net/ea/tradehandler.h" #include "net/ea/specialhandler.h" +#include "net/ea/gui/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/messagein.h" @@ -68,6 +69,7 @@ namespace EAthena { ServerInfo charServer; ServerInfo mapServer; +extern Guild *eaGuild; extern Party *eaParty; GeneralHandler::GeneralHandler(): @@ -226,12 +228,14 @@ void GeneralHandler::guiWindowsLoaded() void GeneralHandler::guiWindowsUnloaded() { + socialWindow->removeTab(eaGuild); socialWindow->removeTab(eaParty); - if (partyTab) - { - delete partyTab; - partyTab = 0; - } + + delete guildTab; + guildTab = 0; + + delete partyTab; + partyTab = 0; } void GeneralHandler::clearHandlers() |