From 372e92072c68e44860a5e49487c55a08a9011483 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 16 Jan 2017 14:37:06 +0100 Subject: [PATCH] Fall back to observer mode login in case no simulator is available refs #860 --- src/blackcore/context/contextnetworkimpl.cpp | 8 ++++++++ src/blackgui/components/logincomponent.cpp | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 3a0ecacd4..095856d99 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -179,6 +179,14 @@ namespace BlackCore this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); const CSimulatedAircraft ownAircraft(this->ownAircraft()); 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->presetCallsign(ownAircraft.getCallsign()); this->m_network->presetIcaoCodes(ownAircraft); diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 617b37063..84c5f6012 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -437,7 +437,6 @@ namespace BlackGui else { 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(""); this->highlightModelField(); }