mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-05-24 11:12:27 -04:00
Removed delete DSP engine from Main Window destructor now that DSP engine is global static. Was causing double free.
This commit is contained in:
parent
7c174c552d
commit
af8602a4d9
@ -33,7 +33,8 @@ ENDIF()
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
#include(${QT_USE_FILE})
|
#include(${QT_USE_FILE})
|
||||||
set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" )
|
#set( QT_DEFINITIONS "${QT_DEFINITIONS} -DQT_NO_DEBUG_OUTPUT" )
|
||||||
|
set( QT_DEFINITIONS "${QT_DEFINITIONS}" )
|
||||||
add_definitions(${QT_DEFINITIONS})
|
add_definitions(${QT_DEFINITIONS})
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
@ -334,8 +334,8 @@ void DSPEngine::generateReport()
|
|||||||
sampleRate = m_sampleSource->getSampleRate();
|
sampleRate = m_sampleSource->getSampleRate();
|
||||||
centerFrequency = m_sampleSource->getCenterFrequency();
|
centerFrequency = m_sampleSource->getCenterFrequency();
|
||||||
} else {
|
} else {
|
||||||
sampleRate = 100000;
|
sampleRate = 0;
|
||||||
centerFrequency = 100000000;
|
centerFrequency = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(sampleRate != m_sampleRate) {
|
if(sampleRate != m_sampleRate) {
|
||||||
|
@ -140,7 +140,6 @@ MainWindow::~MainWindow()
|
|||||||
|
|
||||||
m_dspEngine->stop();
|
m_dspEngine->stop();
|
||||||
|
|
||||||
delete m_dspEngine;
|
|
||||||
delete m_messageQueue;
|
delete m_messageQueue;
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user