From fd220c40d353d5e1abb0aa63eebb135cbe967177 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 18 Dec 2010 18:36:45 +0000
Subject: fixed channel autojoin on reconnect

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5205 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/kvirc/kernel/kvi_ircconnection.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 2b1593f4f..c18579c97 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1522,10 +1522,15 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
 		KviKvsScript::run(tmp.ptr(),m_pConsole);
 	}
 
+	bool bJoinStdChannels=true;
+	
 	if(target()->server()->m_pReconnectInfo)
 	{
 		if(!target()->server()->m_pReconnectInfo->m_szJoinChannels.isEmpty())
+		{
+			bJoinStdChannels=false;
 			sendFmtData("JOIN %s",encodeText(target()->server()->m_pReconnectInfo->m_szJoinChannels).data());
+		}
 
 		KviQuery * pQuery;
 
@@ -1559,7 +1564,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
 		target()->server()->m_pReconnectInfo=0;
 	}
 	
-	if(true) //FIXME rejoining standard channels on reconnection, too
+	if(bJoinStdChannels)
 	{
 		if(target()->network()->autoJoinChannelList())
 		{
-- 
cgit v1.3.1-10-gc9f91