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:
commit
f333162663
@ -416,7 +416,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()) {
|
||||
@ -453,7 +455,9 @@ void AppWindow::DisconnectDevice()
|
||||
deviceActionGroup->checkedAction()->setChecked(false);
|
||||
}
|
||||
UpdateStatusBar(DeviceStatusBar::Disconnected);
|
||||
Mode::getActiveMode()->deviceDisconnected();
|
||||
if(Mode::getActiveMode()) {
|
||||
Mode::getActiveMode()->deviceDisconnected();
|
||||
}
|
||||
qDebug() << "Disconnected device";
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user