fix(plugin-events): fix race condition when requesting event updates (#…

…307)
VATSIM-UK · Jul 29, 2021 · 5da1b7c · 5da1b7c
1 parent e061d6a
commit 5da1b7c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/push/PollingPushEventConnection.cpp b/src/push/PollingPushEventConnection.cpp
@@ -58,16 +58,17 @@ namespace UKControllerPlugin {
                 return;
             }
 
+            this->syncInProgress = true;
             this->taskRunner.QueueAsynchronousTask(
                 [this]()
                 {
-                    this->syncInProgress = true;
                     try {
                         nlohmann::json syncResponse = this->api.SyncPluginEvents();
 
                         if (!this->SyncResponseValid(syncResponse)) {
                             this->lastPollTime = std::chrono::system_clock::now();
                             LogWarning("Invalid plugin event sync response from API");
+                            this->updateInProgress = false;
                             return;
                         }
 
@@ -94,16 +95,17 @@ namespace UKControllerPlugin {
                 return;
             }
 
+            this->updateInProgress = true;
             this->taskRunner.QueueAsynchronousTask(
                 [this]()
                 {
-                    this->updateInProgress = true;
                     try {
                         nlohmann::json latestEventsResponse = this->api.GetLatestPluginEvents(this->lastEventId);
 
                         if (!LatestPluginEventsResponseValid(latestEventsResponse)) {
                             LogWarning("Invalid plugin events response from API");
                             this->lastPollTime = std::chrono::system_clock::now();
+                            this->updateInProgress = false;
                             return;
                         }