Set depending objects to nullptr before deleting GUI. Fixes #806

pull/810/head
f4exb 2021-03-15 19:55:17 +01:00
rodzic 451243b381
commit 43059e39b1
6 zmienionych plików z 15 dodań i 2 usunięć

Wyświetl plik

@ -525,6 +525,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
ChannelAnalyzerGUI::~ChannelAnalyzerGUI()
{
m_channelAnalyzer->setSampleSink(nullptr);
qDebug("ChannelAnalyzerGUI::~ChannelAnalyzerGUI");
ui->glScope->disconnectTimer();
delete ui;

Wyświetl plik

@ -275,6 +275,9 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
ATVDemodGUI::~ATVDemodGUI()
{
m_atvDemod->setScopeSink(nullptr);
m_atvDemod->setTVScreen(nullptr);
delete m_scopeVis;
delete ui;
}

Wyświetl plik

@ -266,6 +266,12 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
DATVDemodGUI::~DATVDemodGUI()
{
m_objDATVDemod->SetTVScreen(nullptr);
m_objDATVDemod->setMERLabel(nullptr);
m_objDATVDemod->setCNRLabel(nullptr);
m_objDATVDemod->setMERMeter(nullptr);
m_objDATVDemod->setCNRMeter(nullptr);
delete ui;
}

Wyświetl plik

@ -381,6 +381,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
DSDDemodGUI::~DSDDemodGUI()
{
m_dsdDemod->setScopeXYSink(nullptr);
delete m_scopeVisXY;
delete ui;
}

Wyświetl plik

@ -55,7 +55,7 @@ DSDDemodSink::DSDDemodSink() :
m_squelchDelayLine(24000),
m_audioFifo1(48000),
m_audioFifo2(48000),
m_scopeXY(0),
m_scopeXY(nullptr),
m_scopeEnabled(true),
m_dsdDecoder(),
m_signalFormat(signalFormatNone)
@ -297,7 +297,7 @@ void DSDDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
}
}
if ((m_scopeXY != 0) && (m_scopeEnabled))
if ((m_scopeXY != nullptr) && (m_scopeEnabled))
{
m_scopeXY->feed(m_scopeSampleBuffer.begin(), m_scopeSampleBuffer.end(), true); // true = real samples for what it's worth
}

Wyświetl plik

@ -178,6 +178,8 @@ DemodAnalyzerGUI::DemodAnalyzerGUI(PluginAPI* pluginAPI, FeatureUISet *featureUI
DemodAnalyzerGUI::~DemodAnalyzerGUI()
{
m_demodAnalyzer->setSampleSink(nullptr);
delete ui;
delete m_spectrumScopeComboVis;
delete m_scopeVis;