From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 16 Apr 2008 13:19:06 +0000 (+0000)
Subject: Some fixes in AbstractBufferContainer::setBuffer().
X-Git-Tag: 0.2.0-beta1~35
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4ea3ce9e1ff6df8b1d2a257da7e5fbba9f6cbfbc

Some fixes in AbstractBufferContainer::setBuffer().
---

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index 14440271..fd2b9da9 100644
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -78,19 +78,18 @@ void AbstractBufferContainer::currentChanged(const QModelIndex &current, const Q
 }
 
 void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
-  if(!bufferId.isValid()) {
-    showChatView(0);
-    return;
-  }
-
   AbstractChatView *chatView = 0;
-  Buffer *buf = Client::buffer(bufferId);
-  if(!buf) {
-    qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
-    return;
-  }
   Buffer *prevBuffer = Client::buffer(currentBuffer());
   if(prevBuffer) prevBuffer->setVisible(false);
+
+  Buffer *buf;
+  if(!bufferId.isValid() || !(buf = Client::buffer(bufferId))) {
+    if(bufferId.isValid()) 
+      qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
+    _currentBuffer = 0;
+    showChatView(0);
+    return;
+  }
   if(_chatViews.contains(bufferId)) {
     chatView = _chatViews[bufferId];
   } else {
diff --git a/version.inc b/version.inc
index be268c69..03281a3d 100644
--- a/version.inc
+++ b/version.inc
@@ -4,8 +4,8 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-beta1-pre";
-  quasselDate = "2008-04-15";
-  quasselBuild = 755;
+  quasselDate = "2008-04-16";
+  quasselBuild = 756;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;