From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 20 Oct 2007 01:37:47 +0000 (+0000)
Subject: Fixed crash when joining new channels
X-Git-Tag: 0.1.0~115
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6609a6b6f50274e90ecca1aca2c0e2e9ad2e6327

Fixed crash when joining new channels
---

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 4161ebcb..95748cb1 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -85,10 +85,10 @@ Buffer *Client::buffer(uint bufferUid) {
 
 Buffer *Client::buffer(BufferInfo id) {
   Buffer *buff = buffer(id.uid());
-  
+
   if(!buff) {
     Client *client = Client::instance();
-    Buffer *buff = new Buffer(id, client);
+    buff = new Buffer(id, client);
 
     connect(buff, SIGNAL(userInput(BufferInfo, QString)),
 	    client, SLOT(userInput(BufferInfo, QString)));
@@ -102,7 +102,7 @@ Buffer *Client::buffer(BufferInfo id) {
     client->_buffers[id.uid()] = buff;
     emit client->bufferUpdated(buff);
   }
-  
+  Q_ASSERT(buff);
   return buff;
 }