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:
Alexei Kotov 2025-08-18 15:44:58 +03:00
commit 4f22f24420

View File

@ -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;
} }
} }