kopia lustrzana https://github.com/f4exb/sdrangel
				
				
				
			Merge pull request #1466 from srcejon/fix_1372_maybe
Device GUIs: Stop timers in destructors.pull/1468/head
						commit
						fe357c5df7
					
				|  | @ -65,6 +65,7 @@ AudioOutputGui::AudioOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| AudioOutputGui::~AudioOutputGui() | ||||
| { | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -76,6 +76,8 @@ Bladerf1OutputGui::Bladerf1OutputGui(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| Bladerf1OutputGui::~Bladerf1OutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -91,6 +91,8 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| BladeRF2OutputGui::~BladeRF2OutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -83,6 +83,8 @@ FileOutputGui::FileOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| FileOutputGui::~FileOutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -74,6 +74,8 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| HackRFOutputGui::~HackRFOutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -101,6 +101,8 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| LimeSDROutputGUI::~LimeSDROutputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -87,6 +87,8 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| LocalOutputGui::~LocalOutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -86,6 +86,8 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| PlutoSDROutputGUI::~PlutoSDROutputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -96,6 +96,8 @@ RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* pare | |||
| 
 | ||||
| RemoteOutputSinkGui::~RemoteOutputSinkGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -107,6 +107,8 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| SoapySDROutputGui::~SoapySDROutputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -84,6 +84,8 @@ TestSinkGui::TestSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| TestSinkGui::~TestSinkGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -84,6 +84,8 @@ XTRXOutputGUI::XTRXOutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| XTRXOutputGUI::~XTRXOutputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -73,6 +73,8 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| AirspyGui::~AirspyGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -72,6 +72,8 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| AirspyHFGui::~AirspyHFGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -60,6 +60,7 @@ AudioInputGui::AudioInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| AudioInputGui::~AudioInputGui() | ||||
| { | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -82,6 +82,8 @@ Bladerf1InputGui::Bladerf1InputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| Bladerf1InputGui::~Bladerf1InputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -104,6 +104,8 @@ BladeRF2InputGui::BladeRF2InputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| BladeRF2InputGui::~BladeRF2InputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -162,6 +162,8 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| FCDProGui::~FCDProGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -80,6 +80,8 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| FCDProPlusGui::~FCDProPlusGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -85,6 +85,7 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| FileInputGUI::~FileInputGUI() | ||||
| { | ||||
|     qDebug("FileInputGUI::~FileInputGUI"); | ||||
|     m_statusTimer.stop(); | ||||
| 	delete ui; | ||||
|     qDebug("FileInputGUI::~FileInputGUI: end"); | ||||
| } | ||||
|  |  | |||
|  | @ -78,6 +78,8 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| HackRFInputGui::~HackRFInputGui() | ||||
| { | ||||
|     qDebug("HackRFInputGui::~HackRFInputGui"); | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
|     qDebug("HackRFInputGui::~HackRFInputGui: end"); | ||||
| } | ||||
|  |  | |||
|  | @ -107,6 +107,8 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| LimeSDRInputGUI::~LimeSDRInputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -100,6 +100,8 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| LocalInputGui::~LocalInputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -70,6 +70,8 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| PerseusGui::~PerseusGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -88,6 +88,8 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| PlutoSDRInputGui::~PlutoSDRInputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -105,6 +105,9 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| RemoteInputGui::~RemoteInputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     m_remoteUpdateTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -92,6 +92,8 @@ RemoteTCPInputGui::RemoteTCPInputGui(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| RemoteTCPInputGui::~RemoteTCPInputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -89,6 +89,8 @@ SDRPlayGui::SDRPlayGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| SDRPlayGui::~SDRPlayGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -125,6 +125,8 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| SDRPlayV3Gui::~SDRPlayV3Gui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -99,6 +99,7 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) | |||
| 
 | ||||
| SigMFFileInputGUI::~SigMFFileInputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
| 	delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -109,6 +109,8 @@ SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| SoapySDRInputGui::~SoapySDRInputGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -81,6 +81,8 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| TestSourceGui::~TestSourceGui() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -95,6 +95,8 @@ USRPInputGUI::USRPInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| USRPInputGUI::~USRPInputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -87,6 +87,8 @@ XTRXInputGUI::XTRXInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : | |||
| 
 | ||||
| XTRXInputGUI::~XTRXInputGUI() | ||||
| { | ||||
|     m_statusTimer.stop(); | ||||
|     m_updateTimer.stop(); | ||||
|     delete ui; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Ładowanie…
	
		Reference in New Issue
	
	 Edouard Griffiths
						Edouard Griffiths