X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e09684b64033b179947844494f8c8ec41ee7c4a3;hp=804f82760f43dbe897d6a120b212d5c03eff5e3c;hb=28fc9bfe81feab904fdce65d433d5f072ee5c81e;hpb=a45c66ff2974e6599ac97884c60da9e29a402ddf

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 804f8276..e09684b6 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -380,9 +380,22 @@ void Client::networkDestroyed() {
 }
 
 void Client::recvMessage(const Message &msg) {
-  Buffer *b = buffer(msg.bufferInfo());
-  b->appendMsg(msg);
-  networkModel()->updateBufferActivity(msg);
+  if(msg.type() == Message::Error) {
+    Buffer *b = buffer(msg.bufferInfo().bufferId());
+    if(b) {
+      b->appendMsg(msg);
+      networkModel()->updateBufferActivity(msg);
+    } else {
+      //TODO: display message in the status buffer
+      b = buffer(msg.bufferInfo());
+      b->appendMsg(msg);
+      networkModel()->updateBufferActivity(msg);
+    }
+  } else {
+    Buffer *b = buffer(msg.bufferInfo());
+    b->appendMsg(msg);
+    networkModel()->updateBufferActivity(msg);
+  }
 
   if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
     const Network *net = network(msg.bufferInfo().networkId());