From: Marcus Eggenberger Date: Fri, 23 May 2008 15:28:28 +0000 (+0000) Subject: Merging branches/0.2/@r857 with trunk X-Git-Tag: 0.3.0~403 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c79539bee8761bcabe057d8d72594d16da24528f;hp=920feae12b62b749299014ce85241165e09b7f4b Merging branches/0.2/@r857 with trunk --- diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp index eee29a8d..22df0c94 100644 --- a/src/common/ircuser.cpp +++ b/src/common/ircuser.cpp @@ -232,7 +232,7 @@ void IrcUser::partChannel(IrcChannel *channel) { disconnect(channel, 0, this, 0); channel->part(this); emit channelParted(channel->name()); - if(_channels.isEmpty() && network()->isMe(this)) + if(_channels.isEmpty() && !network()->isMe(this)) deleteLater(); } } diff --git a/version.inc b/version.inc index 4dd69ac2..38bb553f 100644 --- a/version.inc +++ b/version.inc @@ -4,8 +4,8 @@ { using namespace Global; quasselVersion = "0.3.0-pre"; - quasselDate = "2008-05-22"; - quasselBuild = 850; + quasselDate = "2008-05-23"; + quasselBuild = 858; //! Minimum client build number the core needs clientBuildNeeded = 731;