2 files changed, 3 insertions, 13 deletions
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 6a801bba4..5a8c78c60 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -127,15 +127,8 @@ void GuildTab::handleInput(const std::string &msg)
     if (!taGuild)
         return;
 
-    if (chatWindow)
-    {
-        Net::getGuildHandler()->chat(taGuild->getId(),
-            chatWindow->doReplace(msg));
-    }
-    else
-    {
-        Net::getGuildHandler()->chat(taGuild->getId(), msg);
-    }
+    Net::getGuildHandler()->chat(taGuild->getId(),
+        ChatWindow::doReplace(msg));
 }
 
 void GuildTab::showHelp()
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 76e204205..4a59e89b7 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -64,10 +64,7 @@ PartyTab::~PartyTab()
 
 void PartyTab::handleInput(const std::string &msg)
 {
-    if (chatWindow)
-        Net::getPartyHandler()->chat(chatWindow->doReplace(msg));
-    else
-        Net::getPartyHandler()->chat(msg);
+    Net::getPartyHandler()->chat(ChatWindow::doReplace(msg));
 }
 
 void PartyTab::showHelp()