This should/could fix client crashes related to unvoluntary disconnects from the...

(NOTE: could/should because can't reproduce it on Mac OS -> feedback is welcome)

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 9a16ac1..6c6a3e8 100644 (file)
--- 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 dc010dd..634c402 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -100,7 +100,7 @@ private:
   QString _bufferName;
   Buffer::ActivityLevel _activity;
 
-  QPointer<IrcChannel> _ircChannel;
+  IrcChannel *_ircChannel;
 };
 
 

diff --git a/version.inc b/version.inc
index f6a5638..96693bd 100644 (file)
--- 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;