mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-15 14:56:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_6286' into 'master'

Browse source 
Fix deadlock in Lua worker thread

Closes #6286

See merge request OpenMW/openmw!1228
This commit is contained in:
psi29a 2021-09-19 11:20:26 +00:00
commit d3f5be0950
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/engine.cpp
View file

@ -875,7 +875,14 @@ public:
void join() void join()
{ {
if (mThread) if (mThread)
{
{
std::lock_guard<std::mutex> lk(mMutex);
mJoinRequest = true;
}
mCV.notify_one();
mThread->join(); mThread->join();
}
} }
private: private:
@ -891,10 +898,12 @@ private:
void threadBody() void threadBody()
{ {
while (!mEngine->mViewer->done() && !mEngine->mEnvironment.getStateManager()->hasQuitRequest()) while (true)
{ {
std::unique_lock<std::mutex> lk(mMutex); std::unique_lock<std::mutex> lk(mMutex);
mCV.wait(lk, [&]{ return mUpdateRequest; }); mCV.wait(lk, [&]{ return mUpdateRequest || mJoinRequest; });
if (mJoinRequest)
break;
update(); update();
@ -908,6 +917,7 @@ private:
std::mutex mMutex; std::mutex mMutex;
std::condition_variable mCV; std::condition_variable mCV;
bool mUpdateRequest = false; bool mUpdateRequest = false;
bool mJoinRequest = false;
double mDt = 0; double mDt = 0;
bool mIsGuiMode = false; bool mIsGuiMode = false;
std::optional<std::thread> mThread; std::optional<std::thread> mThread;