From f1089303eab0a2cac8e33df5be145bcd36dad6a1 Mon Sep 17 00:00:00 2001 From: Kiara Navarro Date: Mon, 4 Jul 2022 08:44:10 -0500 Subject: [PATCH] app: fix init and disconnect device in active mode --- Software/PC_Application/appwindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp index 4101a5b..2b98ae9 100644 --- a/Software/PC_Application/appwindow.cpp +++ b/Software/PC_Application/appwindow.cpp @@ -393,7 +393,9 @@ bool AppWindow::ConnectToDevice(QString serial) ui->actionFrequency_Calibration->setEnabled(true); UpdateAcquisitionFrequencies(); - Mode::getActiveMode()->initializeDevice(); + if (Mode::getActiveMode()) { + Mode::getActiveMode()->initializeDevice(); + } UpdateReference(); for(auto d : deviceActionGroup->actions()) { @@ -430,7 +432,9 @@ void AppWindow::DisconnectDevice() deviceActionGroup->checkedAction()->setChecked(false); } UpdateStatusBar(DeviceStatusBar::Disconnected); - Mode::getActiveMode()->deviceDisconnected(); + if(Mode::getActiveMode()) { + Mode::getActiveMode()->deviceDisconnected(); + } qDebug() << "Disconnected device"; }