Merge commit '6a26535292674b2cfb683b8b66425b5a79caf4e1' into 2.0.0

1 files changed, 6 insertions, 2 deletions

diff --git a/script/core/guide2.lua b/script/core/guide2.lua
index 576c0c20..183555b3 100644
--- a/script/core/guide2.lua
+++ b/script/core/guide2.lua
@@ -3021,7 +3021,7 @@ function m.searchSameFields(status, simple, mode)
             locks[start] = lock
         end
         if lock[obj] then
-            return
+            return false
         end
         lock[obj] = true
         queueLen = queueLen + 1
@@ -3037,13 +3037,17 @@ function m.searchSameFields(status, simple, mode)
                 forces[queueLen] = force
             end
         end
+        return true
     end
     local function pushQueue(obj, start, force)
         if obj.type == 'getlocal'
         or obj.type == 'setlocal' then
             obj = obj.node
         end
-        appendQueue(obj, start, force)
+        if appendQueue(obj, start, force) == false then
+            -- no need to process the rest if obj is already locked
+            return
+        end
         if obj.type == 'local' and obj.ref then
             for _, ref in ipairs(obj.ref) do
                 appendQueue(ref, start, force)