fixing buffered backlog replay for reconnects

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ce734cc..a53d07d 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -294,6 +294,7 @@ void Client::disconnectFromCore() {
   emit disconnected();
   emit coreConnectionStateChanged(false);
 
+  backlogManager()->reset();
   messageProcessor()->reset();
 
   // Clear internal data. Hopefully nothing relies on it at this point.

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index 29af54c..b485726 100644 (file)
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -77,3 +77,9 @@ void ClientBacklogManager::requestInitialBacklog() {
   FixedBacklogRequester backlogRequester(this);
   backlogRequester.requestBacklog();
 }
+
+void ClientBacklogManager::reset() {
+  _buffer = true;
+  _messageBuffer.clear();
+  _buffersWaiting.clear();
+}

diff --git a/src/client/clientbacklogmanager.h b/src/client/clientbacklogmanager.h
index 2f0fcf3..ae6b147 100644 (file)
--- a/src/client/clientbacklogmanager.h
+++ b/src/client/clientbacklogmanager.h
@@ -37,6 +37,8 @@ public slots:
   virtual QVariantList requestBacklog(BufferId bufferId, int lastMsgs = -1, int offset = -1);
   void requestInitialBacklog();
 
+  void reset();
+
 private:
   bool _buffer;
   QList<Message> _messageBuffer;