flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow some long lasting validation functions to be stopped/interrupted from "outside"

Browse Source
This commit is contained in:
Klaus Basan
2020-02-29 19:22:23 +01:00
committed by Mat Sutcliffe
parent f3bfaa3179
commit 049ded16cc
6 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -1527,9 +1527,9 @@ namespace BlackMisc
return msgs;
}
CStatusMessageList CAircraftModelList::validateFiles(CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped, const QString &simRootDirectory, bool alreadySortedByFn) const
CStatusMessageList CAircraftModelList::validateFiles(CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &wasStopped, const QString &simRootDirectory, bool alreadySortedByFn) const
{
stopped = false;
wasStopped = false;
CStatusMessageList msgs;
QSet<QString> failedFiles;
@@ -1549,6 +1549,7 @@ namespace BlackMisc
for (const CAircraftModel &model : as_const(sorted))
{
if (wasStopped) { break; } // allow breaking from external
bool ok = false;
do
{
@@ -1600,7 +1601,7 @@ namespace BlackMisc
CAircraftModelList::addAsValidOrInvalidModel(model, ok, validModels, invalidModels);
if (stopAtFailedFiles > 0 && failedFilesCount >= stopAtFailedFiles)
{
stopped = true;
wasStopped = true;
msgs.push_back(CStatusMessage(this).validationWarning(u"Stopping after %1 failed files") << failedFilesCount);
break;
}