From af8602a4d9db148e5892d0593b153142e3d9e0c4 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 9 Aug 2015 16:11:05 +0200 Subject: [PATCH] Removed delete DSP engine from Main Window destructor now that DSP engine is global static. Was causing double free. --- CMakeLists.txt | 3 ++- sdrbase/dsp/dspengine.cpp | 4 ++-- sdrbase/mainwindow.cpp | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28b3ad353..2376e076a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,8 @@ ENDIF() ############################################################################## #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}) if(MSVC) diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp index 6e5deda6b..58b22a584 100644 --- a/sdrbase/dsp/dspengine.cpp +++ b/sdrbase/dsp/dspengine.cpp @@ -334,8 +334,8 @@ void DSPEngine::generateReport() sampleRate = m_sampleSource->getSampleRate(); centerFrequency = m_sampleSource->getCenterFrequency(); } else { - sampleRate = 100000; - centerFrequency = 100000000; + sampleRate = 0; + centerFrequency = 0; } if(sampleRate != m_sampleRate) { diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index d4025d0a3..73f46ce11 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -140,7 +140,6 @@ MainWindow::~MainWindow() m_dspEngine->stop(); - delete m_dspEngine; delete m_messageQueue; delete ui; }