From: Marcus Eggenberger Date: Fri, 14 Nov 2008 14:06:20 +0000 (+0100) Subject: fixing a bug that caused the client to request init data for ircUsers and ircChannel... X-Git-Tag: 0.3.1~40 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f131d8238d098f0b85e570f6e88d164ecb673734 fixing a bug that caused the client to request init data for ircUsers and ircChannel objects twice --- diff --git a/src/common/network.cpp b/src/common/network.cpp index c020b699..23ce589f 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -186,7 +186,7 @@ IrcUser *Network::newIrcUser(const QString &hostmask, const QVariantMap &initDat QString nick(nickFromMask(hostmask).toLower()); if(!_ircUsers.contains(nick)) { IrcUser *ircuser = new IrcUser(hostmask, this); - if(initData.isEmpty()) { + if(!initData.isEmpty()) { ircuser->fromVariantMap(initData); ircuser->setInitialized(); } @@ -267,7 +267,7 @@ IrcUser *Network::ircUser(QString nickname) const { IrcChannel *Network::newIrcChannel(const QString &channelname, const QVariantMap &initData) { if(!_ircChannels.contains(channelname.toLower())) { IrcChannel *channel = ircChannelFactory(channelname); - if(initData.isEmpty()) { + if(!initData.isEmpty()) { channel->fromVariantMap(initData); channel->setInitialized(); }