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

Fall back to observer mode login in case no simulator is available

Browse Source 
refs #860
This commit is contained in:
Roland Winklmeier
2017-01-16 14:37:06 +01:00
committed by Mathew Sutcliffe
parent f5058574d0
commit 372e92072c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -179,6 +179,14 @@ namespace BlackCore
this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser());
const CSimulatedAircraft ownAircraft(this->ownAircraft()); const CSimulatedAircraft ownAircraft(this->ownAircraft());
this->m_network->presetServer(server); this->m_network->presetServer(server);
// Fall back to observer mode, if no simulator is available or not simulating
if(!this->getIContextSimulator()->isSimulatorSimulating())
{
CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode");
mode = INetwork::LoginAsObserver;
}
this->m_network->presetLoginMode(mode); this->m_network->presetLoginMode(mode);
this->m_network->presetCallsign(ownAircraft.getCallsign()); this->m_network->presetCallsign(ownAircraft.getCallsign());
this->m_network->presetIcaoCodes(ownAircraft); this->m_network->presetIcaoCodes(ownAircraft);

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

@@ -437,7 +437,6 @@ namespace BlackGui
else else
{ {
model = this->getPrefillModel(); model = this->getPrefillModel();
ui->gbp_LoginMode->setLoginMode(INetwork::LoginNormal); //! \todo Set observer mode without simulator, currently not working in OBS mode
ui->le_SimulatorModel->setText(""); ui->le_SimulatorModel->setText("");
this->highlightModelField(); this->highlightModelField();
} }