From cefb6145a213a824fcdf897087e0f385b8e5b7b5 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 6 Mar 2016 09:40:07 +0100
Subject: [PATCH] OpenGL modernization: call cleanup() in destructors

---
 sdrbase/gui/glscope.cpp    | 5 ++++-
 sdrbase/gui/glspectrum.cpp | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp
index 1ac963890..5601005e7 100644
--- a/sdrbase/gui/glscope.cpp
+++ b/sdrbase/gui/glscope.cpp
@@ -92,7 +92,10 @@ GLScope::GLScope(QWidget* parent) :
 
 GLScope::~GLScope()
 {
-	if(m_dspEngine != NULL) {
+	cleanup();
+
+	if(m_dspEngine != 0)
+	{
 		m_dspEngine->removeSink(m_scopeVis);
 		delete m_scopeVis;
 	}
diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp
index b705fd935..18b9bf4f3 100644
--- a/sdrbase/gui/glspectrum.cpp
+++ b/sdrbase/gui/glspectrum.cpp
@@ -117,6 +117,8 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
 
 GLSpectrum::~GLSpectrum()
 {
+	cleanup();
+
 	QMutexLocker mutexLocker(&m_mutex);
 
 	m_changesPending = true;