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

Issue #115 Opening login view doesn't trigger disconnect countdown

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-09-01 20:38:27 +01:00
parent ad9779ed3c
commit fbbfd5ebe2
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,34 +198,13 @@ namespace BlackGui
m_logoffCountdownTimer.stop(); // in any case stop the timer m_logoffCountdownTimer.stop(); // in any case stop the timer
if (currentWidget != this && currentWidget != this->parentWidget()) if (currentWidget != this && currentWidget != this->parentWidget())
{ {
// const bool wasVisible = m_visible;
m_visible = false;
m_logoffCountdownTimer.stop(); m_logoffCountdownTimer.stop();
/** T639
if (!wasVisible)
{
// set own values, and send signals
this->setOwnModelAndIcaoValues();
}
**/
} }
else else
{ {
if (m_visible) this->setOwnModelAndIcaoValues();
{ const bool isConnected = sGui->getIContextNetwork()->isConnected();
// already visible: this->setUiLoginState(isConnected);
// re-trigger! treat as same as OK
this->toggleNetworkConnection();
}
else
{
m_visible = true;
this->setOwnModelAndIcaoValues();
const bool isConnected = sGui->getIContextNetwork()->isConnected();
this->setUiLoginState(isConnected);
if (isConnected) { this->startLogoffTimerCountdown(); }
}
} }
// we decided to make it difficult for users to disable it // we decided to make it difficult for users to disable it

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

@@ -249,7 +249,6 @@ namespace BlackGui
QScopedPointer<CDbQuickMappingWizard> m_mappingWizard; //!< mapping wizard QScopedPointer<CDbQuickMappingWizard> m_mappingWizard; //!< mapping wizard
BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginComponent::loginDataChangedDigest, 1500, 10 }; BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginComponent::loginDataChangedDigest, 1500, 10 };
bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed
bool m_visible = false; //!< is this component selected?
bool m_updatePilotOnServerChanges = true; bool m_updatePilotOnServerChanges = true;
const QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"}; const QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"};
const QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"}; const QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"};