Fix memory watches triggering when non-memory AT-backend connects

black-sliver · Dec 26, 2024 · d35ddc4 · d35ddc4
1 parent c495a0f
commit d35ddc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/autotracker.h b/src/core/autotracker.h
@@ -178,9 +178,13 @@ class AutoTracker final : public LuaInterface<AutoTracker>{
         return State::Unavailable;
     }
 
-    bool isAnyConnected()
+    bool isAnyMemoryConnected()
     {
         for (int index = 0; index < (int)_state.size(); ++index) {
+            if (_ap && _backendIndex[_ap] == index)
+                continue; // AP doesn't have memory
+            if (_uat && _backendIndex[_uat] == index)
+                continue; // UAT doesn't have memory
             if (getState(index) >= State::ConsoleConnected)
                 return true;
         }

diff --git a/src/core/scripthost.cpp b/src/core/scripthost.cpp
@@ -561,7 +561,7 @@ void ScriptHost::resetWatches()
 
 void ScriptHost::runMemoryWatchCallbacks()
 {
-    if (!_autoTracker || !_autoTracker->isAnyConnected())
+    if (!_autoTracker || !_autoTracker->isAnyMemoryConnected())
         return;
 
     // we need to run callbacks because the autotracker changed some cache