Properly flushing buffers after all backlog was received.

This fixes a bug where it seems to be impossible to delete a buffer.

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index b26fe17..4a6524c 100644 (file)
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -57,6 +57,16 @@ BufferIdList BacklogRequester::allBufferIds() const {
   return bufferIds.toList();
 }
 
   return bufferIds.toList();
 }
 

+void BacklogRequester::flushBuffer() {
+  if(!_buffersWaiting.isEmpty()) {
+    qWarning() << Q_FUNC_INFO << "was called before all backlog was received:"
+               << _buffersWaiting.count() << "buffers are waiting.";
+  }
+  _bufferedMessages.clear();
+  _totalBuffers = 0;
+  _buffersWaiting.clear();
+}
+

 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index c7c3afe..e813c6c 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -48,12 +48,14 @@ public:
 
   inline int buffersWaiting() const { return _buffersWaiting.count(); }
   inline int totalBuffers() const { return _totalBuffers; }
 
   inline int buffersWaiting() const { return _buffersWaiting.count(); }
   inline int totalBuffers() const { return _totalBuffers; }

-  //! returns false if it was the last missing backlogpart
-  bool buffer(BufferId bufferId, const MessageList &messages);
-  
+
+  bool buffer(BufferId bufferId, const MessageList &messages); //! returns false if it was the last missing backlogpart
+

   virtual void requestBacklog(const BufferIdList &bufferIds) = 0;
   virtual inline void requestInitialBacklog() { requestBacklog(allBufferIds()); }
 
   virtual void requestBacklog(const BufferIdList &bufferIds) = 0;
   virtual inline void requestInitialBacklog() { requestBacklog(allBufferIds()); }
 

+  virtual void flushBuffer();
+

 protected:
   BufferIdList allBufferIds() const;
   inline void setWaitingBuffers(const QList<BufferId> &buffers) { setWaitingBuffers(buffers.toSet()); }
 protected:
   BufferIdList allBufferIds() const;
   inline void setWaitingBuffers(const QList<BufferId> &buffers) { setWaitingBuffers(buffers.toSet()); }

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index 476fa10..0a02e4e 100644 (file)
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -56,7 +56,8 @@ void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId
     bool lastPart = !_requester->buffer(bufferId, msglist);
     updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
     if(lastPart) {
     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);
     }
   } else {
     dispatchMessages(msglist);


@@ -132,11 +133,6 @@ void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
   };
 }
 
   };
 }
 

-void ClientBacklogManager::stopBuffering() {
-  Q_ASSERT(_requester);
-  dispatchMessages(_requester->bufferedMessages(), true);
-}
-

 bool ClientBacklogManager::isBuffering() {
   return _requester && _requester->isBuffering();
 }
 bool ClientBacklogManager::isBuffering() {
   return _requester && _requester->isBuffering();
 }

diff --git a/src/client/clientbacklogmanager.h b/src/client/clientbacklogmanager.h
index 1c9f6dd..2aa399b 100644 (file)
--- a/src/client/clientbacklogmanager.h
+++ b/src/client/clientbacklogmanager.h
@@ -56,7 +56,6 @@ signals:
 
 private:
   bool isBuffering();
 
 private:
   bool isBuffering();

-  void stopBuffering();

   BufferIdList filterNewBufferIds(const BufferIdList &bufferIds);
 
   void dispatchMessages(const MessageList &messages, bool sort = false);
   BufferIdList filterNewBufferIds(const BufferIdList &bufferIds);
 
   void dispatchMessages(const MessageList &messages, bool sort = false);