refs #246 added ISimulator::aircraftModelChanged signal which can be sent via the contexts to CAirspaceMonitor, which needs the model when sending FSIPI(R) custom packets

This commit is contained in:
Mathew Sutcliffe
2014-06-13 11:46:40 +01:00
parent 2e23f2fd8d
commit a6cd44be8d
9 changed files with 27 additions and 16 deletions

View File

@@ -394,9 +394,6 @@ namespace BlackCore
}
times.insert("Audio", time.restart());
this->m_contextNetwork = IContextNetwork::create(this, config.getModeNetwork(), this->m_dbusServer, this->m_dbusConnection);
times.insert("Network", time.restart());
switch (config.getModeSimulator())
{
case CRuntimeConfig::Local:
@@ -411,6 +408,9 @@ namespace BlackCore
}
times.insert("Simulator", time.restart());
this->m_contextNetwork = IContextNetwork::create(this, config.getModeNetwork(), this->m_dbusServer, this->m_dbusConnection);
times.insert("Network", time.restart());
// checks --------------
// 1. own aircraft and simulator should reside in same location
Q_ASSERT(!this->m_contextSimulator || (this->m_contextOwnAircraft->usingLocalObjects() == this->m_contextSimulator->usingLocalObjects()));