diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 8b7f461e9..3dea8722c 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -38,18 +38,16 @@ namespace BlackGui connect(ui->tvp_OwnAircraftModels, &CAircraftModelView::requestUpdate, this, &CDbOwnModelsComponent::ps_requestOwnModelsUpdate); this->m_lastInteractions.synchronize(); + + // should be single simulator or no simulator (default) const CSimulatorInfo sim = this->m_lastInteractions.getCopy().getLastSimulatorSelection(); + BLACK_VERIFY_X(!sim.isMultipleSimulators(), Q_FUNC_INFO, "Should be single simulator or default"); if (sim.isSingleSimulator()) { // if we have already use this before, use it again, but only from cache this->initModelLoader(sim); this->m_modelLoader->startLoading(IAircraftModelLoader::CacheOnly); } - else - { - BLACK_VERIFY_X(false, Q_FUNC_INFO, "Missing sim"); - } - ui->tvp_OwnAircraftModels->setCustomMenu(new CMergeWithDbDataMenu(ui->tvp_OwnAircraftModels, this->modelLoader(), false)); ui->tvp_OwnAircraftModels->setCustomMenu(new CLoadModelsMenu(this, true)); } diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 8e84905c5..a738cd38d 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -77,6 +77,11 @@ namespace BlackMisc return m_simulator == 0; } + bool CSimulatorInfo::isMultipleSimulators() const + { + return this->numberSimulators() > 1; + } + bool CSimulatorInfo::isAllSimulators() const { return fsx() && fs9() && xplane() && p3d(); diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h index 20f9c1c6a..e043d49d3 100644 --- a/src/blackmisc/simulation/simulatorinfo.h +++ b/src/blackmisc/simulation/simulatorinfo.h @@ -89,6 +89,9 @@ namespace BlackMisc //! No simulator? bool isNoSimulator() const; + //! Represents > 1 simulator + bool isMultipleSimulators() const; + //! Is all simulators? bool isAllSimulators() const;