projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa5df14
)
Make "rejoin channels on reconnect" option work
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 13 Jan 2009 08:26:38 +0000
(09:26 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Tue, 13 Jan 2009 22:59:25 +0000
(23:59 +0100)
src/core/corenetwork.cpp
patch
|
blob
|
history
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
7a34d65
..
ba152a4
100644
(file)
--- a/
src/core/corenetwork.cpp
+++ b/
src/core/corenetwork.cpp
@@
-404,19
+404,21
@@
void CoreNetwork::sendPerform() {
}
// rejoin channels we've been in
}
// 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) {
}
void CoreNetwork::setUseAutoReconnect(bool use) {