X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=6ce23d581623b8933aedbda43bf48b2455206189;hb=c00b7e45809b6f3d6d02abbc1285728fe01af374;hp=ea1738b8f8c73b9030389de94d6c7adef5520b37;hpb=52a7b4d0f289f075aa386445a47d876743bcb6d0;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ea1738b8..6ce23d58 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -72,8 +72,8 @@ Client::Client(QObject *parent)
     _bufferSyncer(0),
     _backlogManager(new ClientBacklogManager(this)),
     _bufferViewManager(0),
-    _messageModel(0),
     _ircListHelper(new ClientIrcListHelper(this)),
+    _messageModel(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {
@@ -646,6 +646,7 @@ void Client::bufferRemoved(BufferId bufferId) {
   Buffer *buff = 0;
   if(_buffers.contains(bufferId)) {
     buff = _buffers.take(bufferId);
+    layoutQueue.removeAll(buff);
     disconnect(buff, 0, this, 0);
   }