1 files changed, 13 insertions, 8 deletions

@@ -173,7 +173,7 @@ struct APState {
             TrackerLog("Location: " + std::to_string(location_id));
           }
 
-          RefreshTracker();
+          RefreshTracker(false);
         });
 
     apclient->set_slot_disconnected_handler([this]() {
@@ -197,7 +197,7 @@ struct APState {
             TrackerLog("Item: " + std::to_string(item.item));
           }
 
-          RefreshTracker();
+          RefreshTracker(false);
         });
 
     apclient->set_retrieved_handler(
@@ -206,14 +206,14 @@ struct APState {
             HandleDataStorage(key, value);
           }
 
-          RefreshTracker();
+          RefreshTracker(false);
         });
 
     apclient->set_set_reply_handler([this](const std::string& key,
                                            const nlohmann::json& value,
                                            const nlohmann::json&) {
       HandleDataStorage(key, value);
-      RefreshTracker();
+      RefreshTracker(false);
     });
 
     apclient->set_slot_connected_handler([this](
@@ -271,7 +271,7 @@ struct APState {
       connected = true;
       has_connection_result = true;
 
-      RefreshTracker();
+      RefreshTracker(true);
 
       std::list<std::string> corrected_keys;
       for (const std::string& key : tracked_data_storage_keys) {
@@ -353,7 +353,7 @@ struct APState {
     }
 
     if (connected) {
-      RefreshTracker();
+      RefreshTracker(false);
     } else {
       client_active = false;
     }
@@ -407,11 +407,16 @@ struct APState {
     return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
   }
 
-  void RefreshTracker() {
+  void RefreshTracker(bool reset) {
     TrackerLog("Refreshing display...");
 
     RecalculateReachability();
-    tracker_frame->UpdateIndicators();
+
+    if (reset) {
+      tracker_frame->ResetIndicators();
+    } else {
+      tracker_frame->UpdateIndicators();
+    }
   }
 
   int64_t GetItemId(const std::string& item_name) {