kopia lustrzana https://github.com/f4exb/sdrangel
Main Window: moved source/sink API destruction last
rodzic
2d519abbb6
commit
8c05974686
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
Ładowanie…
Reference in New Issue