X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=2b2c586482877a3e7d61c06818e3dce8c359f31f;hb=29c6d838bafecd697d55b51f72f1813f36b78ae3;hp=f88c606d74aace988d201a94a1e4f16c36d8f340;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58;p=quassel.git

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index f88c606d..2b2c5864 100644
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -90,7 +90,7 @@ void ClientBacklogManager::requestInitialBacklog() {
     _requester = new FixedBacklogRequester(this);
   };
 
-  _requester->requestBacklog();
+  _requester->requestInitialBacklog();
   if(_requester->isBuffering()) {
     updateProgress(0, _requester->totalBuffers());
   }
@@ -107,7 +107,11 @@ BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &buffer
 }
 
 void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
-  Q_ASSERT(_requester);
+  if(!_requester) {
+    // during client start up this message is to be expected in some situations.
+    qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester (yet?).";
+    return;
+  }
   switch(_requester->type()) {
   case BacklogRequester::GlobalUnread:
     break;