X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=00d49d20136f4178d660eca7d24220037cd70b9c;hb=e2667bcfa59d0a3b7843235dd6235d912cc0c992;hp=fc82d20ff5b988f3a8ee467097c0cef0d9632dce;hpb=8aa25a7c1526915741a7da989cc0a663bd84eb31;p=quassel.git

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index fc82d20f..00d49d20 100644
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -37,7 +37,6 @@ ClientBacklogManager::ClientBacklogManager(QObject *parent)
 
 QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional) {
   _buffersRequested << bufferId;
-  qDebug() << _buffersRequested;
   return BacklogManager::requestBacklog(bufferId, first, last, limit, additional);
 }
 
@@ -104,9 +103,11 @@ void ClientBacklogManager::requestInitialBacklog() {
 
 BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
   BufferIdList newBuffers;
+  QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
   foreach(BufferId bufferId, bufferIds) {
-    if(!_buffersRequested.contains(bufferId))
-      newBuffers << bufferId;
+    if(_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId))
+      continue;
+    newBuffers << bufferId;
   }
   return newBuffers;
 }