diff options
| author |  Fabio Bas | 2010-12-18 18:36:45 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-12-18 18:36:45 +0000 |
| commit | fd220c40d353d5e1abb0aa63eebb135cbe967177 (patch) | |
| tree | 6d7a08d0e4a075244bb191a04958e3a35626fc30 | |
| parent | fix for #1050 (diff) | |
| download | KVIrc-fd220c40d353d5e1abb0aa63eebb135cbe967177.tar.gz KVIrc-fd220c40d353d5e1abb0aa63eebb135cbe967177.tar.bz2 KVIrc-fd220c40d353d5e1abb0aa63eebb135cbe967177.zip | |
fixed channel autojoin on reconnect
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5205 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/kvi_ircconnection.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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()) { |