From 7b02816f82ed1e4b92506660c2444ef59d76afc8 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 4 Oct 2018 18:33:23 +0200 Subject: [PATCH] Ref T389, 1st quickfix for nullptr issue --- src/blackgui/loginmodebuttons.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index b062dfc80..691cfb046 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -26,7 +26,7 @@ namespace BlackGui ui(new Ui::CLoginModeButtons) { ui->setupUi(this); - configureLoginModes(); + this->configureLoginModes(); connect(sGui->getIContextSimulator(), &IContextSimulator::simulatorStatusChanged, this, &CLoginModeButtons::configureLoginModes, Qt::QueuedConnection); } @@ -73,7 +73,14 @@ namespace BlackGui void CLoginModeButtons::configureLoginModes() { - if (!sGui->isDeveloperFlagSet() && !sGui->getIContextSimulator()->isSimulatorSimulating()) + // we have no idea how we can get here without the context existing Ref T389 + if (CBuildConfig::isLocalDeveloperDebugBuild() && (!sGui || !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())) { // Disable pilot login modes ui->rb_LoginNormal->setEnabled(false);