projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take list of auto-rejoin channels directly from core
[quassel.git]
/
src
/
core
/
corenetwork.cpp
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
ba152a4
..
a40b546
100644
(file)
--- a/
src/core/corenetwork.cpp
+++ b/
src/core/corenetwork.cpp
@@
-406,7
+406,7
@@
void CoreNetwork::sendPerform() {
// rejoin channels we've been in
if(rejoinChannels()) {
QStringList channels, keys;
// rejoin channels we've been in
if(rejoinChannels()) {
QStringList channels, keys;
- foreach(QString chan,
persistentChannel
s()) {
+ foreach(QString chan,
coreSession()->persistentChannels(networkId()).key
s()) {
QString key = channelKey(chan);
if(!key.isEmpty()) {
channels.prepend(chan);
QString key = channelKey(chan);
if(!key.isEmpty()) {
channels.prepend(chan);