Merge branch 'fix_7039' into 'master'

Fix #7039: freeze after throwing an error in a queued Lua callback Closes #7039 See merge request OpenMW/openmw!2469
2 years ago · 8108fa0724
parent bc1e0d3522 395f7f0e9a
commit 8108fa0724
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@ -171,7 +171,7 @@ namespace MWLua

        // Run queued callbacks
        for (CallbackWithData& c : mQueuedCallbacks)
-            c.mCallback.call(c.mArg);
+            c.mCallback.tryCall(c.mArg);
        mQueuedCallbacks.clear();

        // Engine handlers in local scripts