From 8a31e96d8534d402db9cd48183c0b15732f7d95e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 8 Feb 2010 14:40:04 -0700
Subject: Merge PartyWindow and GuildWindow into SocialWindow

---
 src/net/ea/generalhandler.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/net/ea/generalhandler.cpp')

diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 24bc79bb..547b0609 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -29,6 +29,7 @@
 #include "gui/inventorywindow.h"
 #include "gui/register.h"
 #include "gui/skilldialog.h"
+#include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
 
 #include "net/ea/adminhandler.h"
@@ -67,6 +68,8 @@ namespace EAthena {
 ServerInfo charServer;
 ServerInfo mapServer;
 
+extern Party *eaParty;
+
 GeneralHandler::GeneralHandler():
     mAdminHandler(new AdminHandler),
     mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)),
@@ -202,7 +205,6 @@ void GeneralHandler::flushNetwork()
 
 void GeneralHandler::guiWindowsLoaded()
 {
-    partyTab = new PartyTab;
     inventoryWindow->setSplitAllowed(false);
     skillDialog->loadSkills("ea-skills.xml");
 
@@ -224,8 +226,12 @@ void GeneralHandler::guiWindowsLoaded()
 
 void GeneralHandler::guiWindowsUnloaded()
 {
-    delete partyTab;
-    partyTab = 0;
+    socialWindow->removeTab(eaParty);
+    if (partyTab)
+    {
+        delete partyTab;
+        partyTab = 0;
+    }
 }
 
 void GeneralHandler::clearHandlers()
-- 
cgit v1.2.3-70-g09d2