From 92472e78a63b9797aec767b1cbfa74df8955489d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 7 May 2017 04:27:20 +0200 Subject: [PATCH] Ref T58, consolidation fixes * override simulator, because values can be removed * DB simulator has priority --- src/blackcore/db/databaseutils.cpp | 1 + src/blackmisc/simulation/aircraftmodel.cpp | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp index 4c6f3ca88..411ebcfc3 100644 --- a/src/blackcore/db/databaseutils.cpp +++ b/src/blackcore/db/databaseutils.cpp @@ -75,6 +75,7 @@ namespace BlackCore CAircraftModel dbModelModified(dbModel); dbModelModified.updateMissingParts(model); dbModelModified.setDistributorOrder(distributorOrder); + dbModelModified.setSimulator(dbModel.getSimulator()); // DB simulator settings have priority return dbModelModified; } diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 8da1e2fc1..aaa8825f0 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -538,14 +538,11 @@ namespace BlackMisc if (this->m_modelMode == Undefined) { this->m_modelType = otherModel.getModelType(); } if (this->m_fileTimestamp < 0) { this->setFileTimestamp(otherModel.getFileTimestamp()); } if (this->m_description.isEmpty() || this->m_description.startsWith(CAircraftModel::autoGenerated(), Qt::CaseInsensitive)) { this->setDescription(otherModel.getDescription()); } - if (this->m_simulator.isUnspecified()) + if (this->getSimulator().isUnspecified()) { + // simulator can only be overridden as simulators can also be removed this->setSimulator(otherModel.getSimulator()); } - else - { - this->m_simulator.add(otherModel.getSimulator()); - } this->m_livery.updateMissingParts(otherModel.getLivery()); this->m_aircraftIcao.updateMissingParts(otherModel.getAircraftIcaoCode()); @@ -665,7 +662,7 @@ namespace BlackMisc QString CAircraftModel::normalizeFileNameForDb(const QString &filePath) { - QString n = CFileUtils::normalizeFilePathToQtStandard(filePath).toUpper(); + const QString n = CFileUtils::normalizeFilePathToQtStandard(filePath).toUpper(); if (n.count('/') < 2) { return n; } return n.section('/', -2, -1); }