mirror of
https://github.com/OpenMW/openmw.git
synced 2025-11-01 05:56:42 +00: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
1 changed files with 3 additions and 3 deletions
|
|
@ -1041,6 +1041,9 @@ void Launcher::DataFilesPage::reloadCells()
|
|||
|
||||
while (true)
|
||||
{
|
||||
if (mAbortReloadCells)
|
||||
return;
|
||||
|
||||
mStartReloadCells.wait(lock);
|
||||
|
||||
if (mAbortReloadCells)
|
||||
|
|
@ -1071,9 +1074,6 @@ void Launcher::DataFilesPage::reloadCells()
|
|||
}
|
||||
|
||||
lock.lock();
|
||||
|
||||
if (mAbortReloadCells)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue