mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-06 09:39:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_crash' into 'master'

Browse Source 
Fix crash in LuaUtil::ScriptsContainer::~ScriptsContainer()

See merge request OpenMW/openmw!1252
This commit is contained in:
Frederic Chardon 2021-09-30 07:32:21 +00:00
commit 5f3a36a9b7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lua/scriptscontainer.cpp
View File

@ -328,6 +328,12 @@ namespace LuaUtil
std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end()); std::make_heap(mHoursTimersQueue.begin(), mHoursTimersQueue.end());
} }
ScriptsContainer::~ScriptsContainer()
{
for (auto& [_, script] : mScripts)
script.mHiddenData[ScriptId::KEY] = sol::nil;
}
void ScriptsContainer::removeAllScripts() void ScriptsContainer::removeAllScripts()
{ {
for (auto& [_, script] : mScripts) for (auto& [_, script] : mScripts)

2
components/lua/scriptscontainer.hpp
View File

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