Merge pull request #125 from sophiekovalevsky/device-init-disconnect-in-active-mode

app: fix init and disconnect device in active mode
This commit is contained in:
jankae 2022-07-09 15:48:22 +02:00 committed by GitHub
commit f333162663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -416,7 +416,9 @@ bool AppWindow::ConnectToDevice(QString serial)
ui->actionFrequency_Calibration->setEnabled(true); ui->actionFrequency_Calibration->setEnabled(true);
UpdateAcquisitionFrequencies(); UpdateAcquisitionFrequencies();
Mode::getActiveMode()->initializeDevice(); if (Mode::getActiveMode()) {
Mode::getActiveMode()->initializeDevice();
}
UpdateReference(); UpdateReference();
for(auto d : deviceActionGroup->actions()) { for(auto d : deviceActionGroup->actions()) {
@ -453,7 +455,9 @@ void AppWindow::DisconnectDevice()
deviceActionGroup->checkedAction()->setChecked(false); deviceActionGroup->checkedAction()->setChecked(false);
} }
UpdateStatusBar(DeviceStatusBar::Disconnected); UpdateStatusBar(DeviceStatusBar::Disconnected);
Mode::getActiveMode()->deviceDisconnected(); if(Mode::getActiveMode()) {
Mode::getActiveMode()->deviceDisconnected();
}
qDebug() << "Disconnected device"; qDebug() << "Disconnected device";
} }