From 97a4aeb939117264b6535856d07d474008c54da4 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 13 Jan 2009 09:26:38 +0100 Subject: [PATCH] Make "rejoin channels on reconnect" option work --- src/core/corenetwork.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index 7a34d659..ba152a42 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -404,19 +404,21 @@ void CoreNetwork::sendPerform() { } // rejoin channels we've been in - QStringList channels, keys; - foreach(QString chan, persistentChannels()) { - QString key = channelKey(chan); - if(!key.isEmpty()) { - channels.prepend(chan); - keys.prepend(key); - } else { - channels.append(chan); + if(rejoinChannels()) { + QStringList channels, keys; + foreach(QString chan, persistentChannels()) { + QString key = channelKey(chan); + if(!key.isEmpty()) { + channels.prepend(chan); + keys.prepend(key); + } else { + channels.append(chan); + } } + QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed(); + if(!joinString.isEmpty()) + userInputHandler()->handleJoin(statusBuf, joinString); } - QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed(); - if(!joinString.isEmpty()) - userInputHandler()->handleJoin(statusBuf, joinString); } void CoreNetwork::setUseAutoReconnect(bool use) { -- 2.20.1