From b977b871777060034d592b25e6397451c97f49df Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 27 Oct 2018 01:55:34 +0200 Subject: [PATCH] Avoid issue when shutting down --- src/blackgui/loginmodebuttons.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index 691cfb046..1847d5318 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -73,14 +73,16 @@ namespace BlackGui void CLoginModeButtons::configureLoginModes() { + if (!sGui || sGui->isShuttingDown()) { return; } + // we have no idea how we can get here without the context existing Ref T389 - if (CBuildConfig::isLocalDeveloperDebugBuild() && (!sGui || !sGui->getIContextSimulator())) + if (CBuildConfig::isLocalDeveloperDebugBuild() && (!sGui->getIContextSimulator())) { // how is this possible Q_ASSERT_X(false, Q_FUNC_INFO, "No context or sGUI"); } - if (!sGui || !sGui->getIContextSimulator() || (!sGui->isDeveloperFlagSet() && !sGui->getIContextSimulator()->isSimulatorSimulating())) + if (!sGui->getIContextSimulator() || (!sGui->isDeveloperFlagSet() && !sGui->getIContextSimulator()->isSimulatorSimulating())) { // Disable pilot login modes ui->rb_LoginNormal->setEnabled(false);