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

Use a default simulator for emulated driver to avoid ASSERT

Browse Source
This commit is contained in:
Klaus Basan
2019-04-14 20:10:16 +02:00
parent 9287713cb8
commit 9e1f437326
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -321,7 +321,7 @@ namespace BlackMisc
CSimulatorInfo guessDefaultSimulatorImpl()
{
static const CSimulatorInfo locallyInstalled(CSimulatorInfo::getLocallyInstalledSimulators());
if (CBuildConfig::isRunningOnLinuxPlatform())
if (CBuildConfig::isRunningOnLinuxPlatform() || CBuildConfig::isRunningOnMacOSPlatform())
{
return CSimulatorInfo::xplane();
}

13
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -352,14 +352,21 @@ namespace BlackSimPlugin
void CSimulatorEmulated::onSettingsChanged()
{
if (!sApp || sApp->isShuttingDown()) { return; }
const CSwiftPluginSettings settings(m_pluginSettings.get());
m_log = settings.isLoggingFunctionCalls();
const CSimulatorInfo simulator = settings.getEmulatedSimulator();
CSimulatorInfo simulator = settings.getEmulatedSimulator();
if (!simulator.isSingleSimulator())
{
// this will always be the same
simulator = CSimulatorInfo::guessDefaultSimulator();
}
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "need single simulator");
const CSimulatorPluginInfoList plugins = sApp->getIContextSimulator()->getAvailableSimulatorPlugins();
const CSimulatorPluginInfo plugin = plugins.findBySimulator(simulator);
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "need single simulator");
if (plugin.isValid())
{
// ? restart driver, disconnect/reconnect
@@ -386,7 +393,7 @@ namespace BlackSimPlugin
},
Qt::QueuedConnection));
m_connectionGuard.append(connect(this, &ISimulator::ownAircraftModelChanged, this, [ = ](const CAircraftModel &model)
m_connectionGuard.append(connect(this, &ISimulator::ownAircraftModelChanged, this, [ = ](const CAircraftModel & model)
{
if (!m_monitorWidget) return;
m_monitorWidget->appendSendingCall("ownAircraftModelChanged", model.toQString());