diff --git a/src/blackmisc/simulation/backgroundvalidation.cpp b/src/blackmisc/simulation/backgroundvalidation.cpp index 628ea5984..2a59b9468 100644 --- a/src/blackmisc/simulation/backgroundvalidation.cpp +++ b/src/blackmisc/simulation/backgroundvalidation.cpp @@ -35,10 +35,11 @@ namespace BlackMisc m_updateTimer.setInterval(60 * 1000); } - void CBackgroundValidation::setCurrentSimulator(const CSimulatorInfo &simulator) + void CBackgroundValidation::setCurrentSimulator(const CSimulatorInfo &simulator, const QString &simDirectory) { QWriteLocker l(&m_lock); - m_simulator = simulator; + m_simulator = simulator; + m_simDirectory = simDirectory; } bool CBackgroundValidation::wasAlreadyChecked(const CSimulatorInfo &simulator) const @@ -130,7 +131,7 @@ namespace BlackMisc msgs.push_back(CStatusMessage(this, CStatusMessage::SeverityWarning, QStringLiteral("No models in set for '%1'").arg(simulator.toQString(true)))); break; } - msgs = CAircraftModelUtilities::validateModelFiles(models, valid, invalid, false, 25, wasStopped); + msgs = CAircraftModelUtilities::validateModelFiles(models, valid, invalid, false, 25, wasStopped, m_simDirectory); const qint64 now = QDateTime::currentMSecsSinceEpoch(); const qint64 deltaTimeMs = now - started; diff --git a/src/blackmisc/simulation/backgroundvalidation.h b/src/blackmisc/simulation/backgroundvalidation.h index 63cf7e390..490a67e3a 100644 --- a/src/blackmisc/simulation/backgroundvalidation.h +++ b/src/blackmisc/simulation/backgroundvalidation.h @@ -41,7 +41,7 @@ namespace BlackMisc //! Corresponding simulator //! \threadsafe - void setCurrentSimulator(const CSimulatorInfo &simulator); + void setCurrentSimulator(const CSimulatorInfo &simulator, const QString &simDirectory); //! Was already checked for simulator? //! \threadsafe @@ -76,9 +76,10 @@ namespace BlackMisc void validated(const CSimulatorInfo &simulator, const CAircraftModelList &validModels, const CAircraftModelList &invalidModels, bool stopped, const CStatusMessageList &msgs); private: - mutable QReadWriteLock m_lock; //!< lock snapshot - std::atomic_bool m_inWork { false }; //!< indicates a running update - CSimulatorInfo m_simulator; + mutable QReadWriteLock m_lock; //!< lock snapshot + std::atomic_bool m_inWork { false }; //!< indicates a running update + CSimulatorInfo m_simulator; //!< simulator + QString m_simDirectory; //!< corresponding sim directory // last result values, mostly needed when running in the distributed swift system and we want to get the values CAircraftModelList m_lastResultValid;