From 13c2533f4a2d27f1c9156df2a8ad2851be2016fd Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Nov 2012 00:42:01 +0300
Subject: Fix option "Show chat history" for all tabs.

---
 src/net/ea/guildhandler.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 4af230773..5c9b94529 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -22,6 +22,7 @@
 #include "net/ea/guildhandler.h"
 
 #include "actorspritemanager.h"
+#include "configuration.h"
 #include "localplayer.h"
 
 #include "gui/socialwindow.h"
@@ -122,7 +123,8 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg)
     if (!guildTab && chatWindow)
     {
         guildTab = new GuildTab(chatWindow);
-        guildTab->loadFromLogFile("#Guild");
+        if (config.getBoolValue("showChatHistory"))
+            guildTab->loadFromLogFile("#Guild");
         if (player_node)
             player_node->addGuild(taGuild);
         memberList(guildId);
-- 
cgit v1.2.3-60-g2f50