X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=f579e60c5a27f584d158c8346e3fbeb80b3b1b76;hb=cb5a11622fe175661f7e1a0a1d545444a4ac801b;hp=476fa103ab4cf99bd3abc2863cd27d80f68bef2e;hpb=c230f7bd892b78b09710cf5746c2bf12a73d6b9b;p=quassel.git diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp index 476fa103..f579e60c 100644 --- a/src/client/clientbacklogmanager.cpp +++ b/src/client/clientbacklogmanager.cpp @@ -29,6 +29,7 @@ #include +INIT_SYNCABLE_OBJECT(ClientBacklogManager) ClientBacklogManager::ClientBacklogManager(QObject *parent) : BacklogManager(parent), _requester(0) @@ -56,7 +57,8 @@ void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId bool lastPart = !_requester->buffer(bufferId, msglist); updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers()); if(lastPart) { - stopBuffering(); + dispatchMessages(_requester->bufferedMessages(), true); + _requester->flushBuffer(); } } else { dispatchMessages(msglist); @@ -132,11 +134,6 @@ void ClientBacklogManager::checkForBacklog(const QList &bufferIds) { }; } -void ClientBacklogManager::stopBuffering() { - Q_ASSERT(_requester); - dispatchMessages(_requester->bufferedMessages(), true); -} - bool ClientBacklogManager::isBuffering() { return _requester && _requester->isBuffering(); }