From 4ba498c04b9aefee2e3ab9d2eb0645f86e5d1968 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 15 Apr 2008 11:41:14 +0000 Subject: [PATCH] This should/could fix client crashes related to unvoluntary disconnects from the ircserver. (NOTE: could/should because can't reproduce it on Mac OS -> feedback is welcome) --- src/client/networkmodel.cpp | 3 +++ src/client/networkmodel.h | 2 +- version.inc | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 9a16ac17..6c6a3e80 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -144,6 +144,9 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { } void BufferItem::ircChannelDestroyed() { + Q_CHECK_PTR(_ircChannel); + disconnect(_ircChannel, 0, this, 0); + _ircChannel = 0; emit dataChanged(); removeAllChilds(); } diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index dc010dd8..634c402e 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -100,7 +100,7 @@ private: QString _bufferName; Buffer::ActivityLevel _activity; - QPointer _ircChannel; + IrcChannel *_ircChannel; }; diff --git a/version.inc b/version.inc index f6a56384..96693bd1 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-beta1-pre"; quasselDate = "2008-04-15"; - quasselBuild = 748; + quasselBuild = 750; //! Minimum client build number the core needs clientBuildNeeded = 731; -- 2.20.1