Add workaround for duplicate syncs

1 files changed, 8 insertions, 1 deletions

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 012f1e69..518be31c 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -1060,7 +1060,14 @@ ChatPage::trySync()
         }
 
         http::client()->sync(
-          opts, [this](const mtx::responses::Sync &res, mtx::http::RequestErr err) {
+          opts,
+          [this, since = cache::nextBatchToken()](const mtx::responses::Sync &res,
+                                                  mtx::http::RequestErr err) {
+                  if (since != cache::nextBatchToken()) {
+                          nhlog::net()->warn("Duplicate sync, dropping");
+                          return;
+                  }
+
                   if (err) {
                           const auto error      = QString::fromStdString(err->matrix_error.error);
                           const auto msg        = tr("Please try to login again: %1").arg(error);