Avoid issues if simulator is NOT yet set in emulateed driver

This commit is contained in:
Klaus Basan
2019-06-15 22:59:13 +02:00
committed by Mat Sutcliffe
parent 6bc2a15f61
commit 6cefb5175d
4 changed files with 29 additions and 15 deletions

View File

@@ -11,6 +11,7 @@
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/simulation/flightgear/flightgearutil.h"
#include "blackmisc/verify.h"
#include "blackmisc/stringutils.h"
#include "blackconfig/buildconfig.h"
#include <QStringBuilder>
@@ -195,7 +196,12 @@ namespace BlackMisc
CSimulatorSettings CMultiSimulatorSettings::getSettings(const CSimulatorInfo &simulator) const
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
if (!simulator.isSingleSimulator())
{
// mostly happening with emulated driver, VERIFY for better debugging
BLACK_VERIFY_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
return CSimulatorSettings();
}
switch (simulator.getSimulator())
{
case CSimulatorInfo::FG: return m_simSettingsFG.get();