VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-24 13:05:21 -04:00
Code Issues Projects Releases Wiki Activity

Main Window: moved source/sink API destruction last

Browse Source
This commit is contained in:
f4exb 2018-02-15 00:25:50 +01:00
parent 2d519abbb6
commit 8c05974686
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devices/perseus/deviceperseusscan.cpp
View File

@ -39,6 +39,7 @@ void DevicePerseusScan::scan(int nbDevices)
if (perseus_firmware_download(descr, 0) < 0) {
qCritical("DevicePerseusScan::scan: firmware download error: %s", perseus_errorstr());
perseus_close(descr);
continue;
}
else

8
sdrgui/mainwindow.cpp
View File

@ -395,11 +395,13 @@ void MainWindow::removeLastDevice()
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
delete m_deviceUIs.back()->m_deviceSourceAPI;
DeviceSourceAPI *sourceAPI = m_deviceUIs.back()->m_deviceSourceAPI;
delete m_deviceUIs.back();
lastDeviceEngine->stop();
m_dspEngine->removeLastDeviceSourceEngine();
delete sourceAPI;
}
else if (m_deviceUIs.back()->m_deviceSinkEngine) // sink tab
{
@ -435,11 +437,13 @@ void MainWindow::removeLastDevice()
ui->tabInputsView->setTabToolTip(i, m_deviceWidgetTabs[i].displayName);
}
delete m_deviceUIs.back()->m_deviceSinkAPI;
DeviceSinkAPI *sinkAPI = m_deviceUIs.back()->m_deviceSinkAPI;
delete m_deviceUIs.back();
lastDeviceEngine->stop();
m_dspEngine->removeLastDeviceSinkEngine();
delete sinkAPI;
}
m_deviceUIs.pop_back();