From 52d802baec6a97d5ad27855d09a27fd1cd2d90cb Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 27 Mar 2021 05:33:09 +0100
Subject: [PATCH] DATV: more robust handling of TV screen renderer at
 destruction time

---
 plugins/channelrx/demoddatv/datvdemodgui.cpp | 1 +
 plugins/channelrx/demoddatv/datvideorender.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp
index e59245cde..8ff914732 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp
@@ -266,6 +266,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
 
 DATVDemodGUI::~DATVDemodGUI()
 {
+    m_objDATVDemod->stop();
     m_objDATVDemod->SetTVScreen(nullptr);
     m_objDATVDemod->setMERLabel(nullptr);
     m_objDATVDemod->setCNRLabel(nullptr);
diff --git a/plugins/channelrx/demoddatv/datvideorender.h b/plugins/channelrx/demoddatv/datvideorender.h
index 53938adcf..fec726df2 100644
--- a/plugins/channelrx/demoddatv/datvideorender.h
+++ b/plugins/channelrx/demoddatv/datvideorender.h
@@ -208,7 +208,7 @@ class DATVideoRenderThread : public QThread
             return;
         }
 
-        while (m_renderingVideo == true)
+        while ((m_renderingVideo == true) && (m_renderer))
         {
             if (!m_renderer->RenderStream()) {
                 break;