Merge branch 'fix_crash' into 'master'

Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer() See merge request OpenMW/openmw!1252
OpenMW · Sep 30, 2021 · 5f3a36a · 5f3a36a
2 parents e24937d + 24ecdc3
commit 5f3a36a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/lua/scriptscontainer.cpp b/components/lua/scriptscontainer.cpp
@@ -328,6 +328,12 @@ namespace LuaUtil
         std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
     }
 
+    ScriptsContainer::~ScriptsContainer()
+    {
+        for (auto& [_, script] : mScripts)
+            script.mHiddenData[ScriptId::KEY] = sol::nil;
+    }
+
     void ScriptsContainer::removeAllScripts()
     {
         for (auto& [_, script] : mScripts)

diff --git a/components/lua/scriptscontainer.hpp b/components/lua/scriptscontainer.hpp
@@ -75,7 +75,7 @@ namespace LuaUtil
         ScriptsContainer(LuaUtil::LuaState* lua, std::string_view namePrefix);
         ScriptsContainer(const ScriptsContainer&) = delete;
         ScriptsContainer(ScriptsContainer&&) = delete;
-        virtual ~ScriptsContainer() { removeAllScripts(); }
+        virtual ~ScriptsContainer();
 
         // Adds package that will be available (via `require`) for all scripts in the container.
         // Automatically applies LuaUtil::makeReadOnly to the package.