mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lua_worker_join' into 'master'

Browse Source 
Correctly terminate LuaWorker if the game is being terminated due to an unhanded exception.

See merge request OpenMW/openmw!2044
This commit is contained in:
psi29a 2022-06-22 12:35:21 +00:00
commit e2ae381a6c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/engine.cpp
View File

@ -912,6 +912,15 @@ public:
mThread = std::thread([this]{ threadBody(); }); mThread = std::thread([this]{ threadBody(); });
}; };
~LuaWorker()
{
if (mThread && mThread->joinable())
{
Log(Debug::Error) << "Unexpected destruction of LuaWorker; likely there is an unhandled exception in the main thread.";
join();
}
}
void allowUpdate() void allowUpdate()
{ {
if (!mThread) if (!mThread)