From 847348cbe0bfe53379276abe510cfa8db4221078 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 23 Oct 2016 03:11:37 +0200 Subject: [PATCH] refs #768, model string in login component is supposed to be empty without simulator --- src/blackgui/components/logincomponent.cpp | 5 ++--- src/blackgui/components/logincomponent.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 37bb48194..526b6d17f 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -176,7 +176,7 @@ namespace BlackGui } else { - this->setOwnModel(); + this->setOwnModelAndIcaoValues(); if (this->m_visible) { // already visible: @@ -434,7 +434,7 @@ namespace BlackGui this->m_logoffCountdownTimer->start(); } - void CLoginComponent::setOwnModel() + void CLoginComponent::setOwnModelAndIcaoValues() { Q_ASSERT(sGui->getIContextOwnAircraft()); Q_ASSERT(sGui->getIContextSimulator()); @@ -477,7 +477,6 @@ namespace BlackGui void CLoginComponent::setGuiIcaoValues(const CAircraftModel &model, bool onlyIfEmpty) { - ui->le_SimulatorModel->setText(model.getModelStringAndDbKey()); if (!onlyIfEmpty || !ui->selector_AircraftIcao->isSet()) { ui->selector_AircraftIcao->setAircraftIcao(model.getAircraftIcaoCode()); diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index 90e5efd9b..b8429e2e6 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -172,8 +172,8 @@ namespace BlackGui //! Logoff countdown void startLogoffTimerCountdown(); - //! Own model string - void setOwnModel(); + //! Own model and ICAO data + void setOwnModelAndIcaoValues(); //! Set ICAO values void setGuiIcaoValues(const BlackMisc::Simulation::CAircraftModel &model, bool onlyIfEmpty);