mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-23 03:47:34 -04:00
Merge branch 'fix_cv_handling' into 'master'
Check if reload cells aborted before cv wait See merge request OpenMW/openmw!4862
This commit is contained in:
commit
4f22f24420
@ -1041,6 +1041,9 @@ void Launcher::DataFilesPage::reloadCells()
|
|||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
|
if (mAbortReloadCells)
|
||||||
|
return;
|
||||||
|
|
||||||
mStartReloadCells.wait(lock);
|
mStartReloadCells.wait(lock);
|
||||||
|
|
||||||
if (mAbortReloadCells)
|
if (mAbortReloadCells)
|
||||||
@ -1071,9 +1074,6 @@ void Launcher::DataFilesPage::reloadCells()
|
|||||||
}
|
}
|
||||||
|
|
||||||
lock.lock();
|
lock.lock();
|
||||||
|
|
||||||
if (mAbortReloadCells)
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user