On top fixed bug for core mode in main.cpp
This commit is contained in:
Klaus Basan
2014-04-12 19:34:19 +02:00
parent bfcdf5ed9a
commit 2b07012e4f
7 changed files with 18 additions and 13 deletions

View File

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
coreMode = intro.getCoreMode();
windowMode = intro.getWindowMode();
QString dbusAddress = BlackCore::CDBusServer::fixAddressToDBusAddress(intro.getDBusAddress());
switch (windowMode)
switch (coreMode)
{
case GuiModes::CoreExternal:
runtimeConfig = BlackCore::CRuntimeConfig::remote(dbusAddress);

View File

@@ -67,7 +67,7 @@ void MainWindow::gracefulShutdown()
if (!this->m_init) return;
this->m_init = false;
if (this->m_rt->getIContextApplication())
emit this->m_rt->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStops);
this->m_rt->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStops);
// close info window
if (this->m_infoWindow)
@@ -522,7 +522,6 @@ void MainWindow::updateSimulatorData()
ui->le_SimulatorHeading->setText(ownAircraft.getSituation().getHeading().toFormattedQString());
ui->le_SimulatorGroundSpeed->setText(ownAircraft.getSituation().getGroundSpeed().toFormattedQString());
ui->le_SimulatorCom1Active->setText(ownAircraft.getCom1System().getFrequencyActive().toFormattedQString());
ui->le_SimulatorCom1Standby->setText(ownAircraft.getCom1System().getFrequencyStandby().toFormattedQString());
ui->le_SimulatorCom2Active->setText(ownAircraft.getCom2System().getFrequencyActive().toFormattedQString());

View File

@@ -236,7 +236,7 @@ void MainWindow::init(const CRuntimeConfig &runtimeConfig)
this->initContextMenus();
// starting
emit this->m_rt->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStarts);
this->m_rt->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStarts);
// do this as last statement, so it can be used as flag
// whether init has been completed