Don't add auto started local Lua scripts twice

OpenMW · Jan 1, 2025 · f92b504 · f92b504
1 parent b29949d
commit f92b504
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
@@ -92,13 +92,16 @@ namespace LuaUtil
         if (hasScript(scriptId))
             return false; // already present
 
+        LoadedData& data = ensureLoaded();
+        if (data.mScripts.count(scriptId) != 0)
+            return false; // bail if the script we're adding was auto started
+
         const VFS::Path::Normalized& path = scriptPath(scriptId);
         std::string debugName = mNamePrefix;
         debugName.push_back('[');
         debugName.append(path);
         debugName.push_back(']');
 
-        LoadedData& data = ensureLoaded();
         Script& script = data.mScripts[scriptId];
         script.mHiddenData = view.newTable();
         script.mHiddenData[sScriptIdKey] = ScriptId{ this, scriptId };