From 12090c0a06403d7c21e6dc2df03d9c526c0b3768 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 27 Jul 2020 16:37:29 +0200
Subject: [PATCH] Add workaround for duplicate syncs

---
 src/ChatPage.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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);