X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=58171fe00391889c5e43d329a99936f1cb6aa97f;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hp=374c0bfc28a38540895cdd49c059d3c04f64b810;hpb=257ca0d5f944a8f63d002e1dcaaa3902258d85e0;p=quassel.git

diff --git a/src/common/network.cpp b/src/common/network.cpp
index 374c0bfc..58171fe0 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -537,7 +537,7 @@ QVariantMap Network::initIrcUsersAndChannels() const {
   QHash<QString, IrcChannel *>::const_iterator channelIter = _ircChannels.constBegin();
   QHash<QString, IrcChannel *>::const_iterator channelIterEnd = _ircChannels.constEnd();
   while(channelIter != channelIterEnd) {
-    channels[channelIter.key()] = channelIter.value()->toVariantMap();
+    channels[channelIter.value()->name()] = channelIter.value()->toVariantMap();
     channelIter++;
   }
   usersAndChannels["channels"] = channels;
@@ -547,7 +547,7 @@ QVariantMap Network::initIrcUsersAndChannels() const {
 
 void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) {
   Q_ASSERT(proxy());
-  if(!_ircUsers.isEmpty() || !_ircChannels.isEmpty()) {
+  if(isInitialized()) {
     qWarning() << "Network" << networkId() << "received init data for users and channels allthough there allready are known users or channels!";
     return;
   }