flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #420, refs #417, allow to return combined simulator status, removed unneeded functions

Browse Source 
This should be further improved with #417
This commit is contained in:
Klaus Basan
2015-05-17 20:18:30 +02:00
parent 2d506a4962
commit 0ea07e28e0
12 changed files with 59 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackgui/components/logincomponent.cpp
View File

@@ -15,6 +15,7 @@
#include "blackcore/context_audio.h"
#include "blackcore/context_simulator.h"
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "../uppercasevalidator.h"
@@ -355,8 +356,9 @@ namespace BlackGui
CAircraftIcaoData icao;
bool simConnected = this->getIContextSimulator() && this->getIContextSimulator()->isSimulating();
if (simConnected)
bool simulating = this->getIContextSimulator() &&
(this->getIContextSimulator()->getSimulatorStatus() & ISimulator::Simulating);
if (simulating)
{
CAircraftModel model = this->getIContextOwnAircraft()->getOwnAircraft().getModel();
this->ui->le_SimulatorModel->setText(model.getModelString());
@@ -381,7 +383,6 @@ namespace BlackGui
{
this->setGuiIcaoValues(icao, false);
}
}
void CLoginComponent::setGuiIcaoValues(const CAircraftIcaoData &icao, bool onlyIfEmpty)