Fixed crashes on addon destruction.

pvr.hts/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="4.2.10"
+  version="4.2.11"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>
@@ -182,6 +182,6 @@
     <disclaimer lang="zh_CN">这是不稳定版的软件！作者不对录像失败、错误定时造成时间浪费或其它不良影响负责。</disclaimer>
     <disclaimer lang="zh_TW">這是測試版軟體！其原創作者並無法對於以下情況負責，包含：錄影失敗，不正確的定時設定，多餘時數，或任何產生的其它不良影響...</disclaimer>
     <platform>@PLATFORM@</platform>
-    <news>Implemented GetStreamTimes API function for recordings.</news>
+    <news>Fixed crashes on addon destruction</news>
   </extension>
 </addon>

pvr.hts/changelog.txt

@@ -1,3 +1,6 @@
+4.2.11
+- Fixed crashes on addon destruction
+
 4.2.10
 - PVR API v5.5.0: Implemented GetStreamTimes for recordings
 

src/Tvheadend.cpp

@@ -57,12 +57,8 @@ CTvheadend::CTvheadend(PVR_PROPERTIES *pvrProps)
 CTvheadend::~CTvheadend()
 {
   for (auto *dmx : m_dmx)
-  {
     delete dmx;
-  }
 
-  m_conn->Stop();
-  StopThread();
   delete m_conn;
   delete m_vfs;
 }
@@ -73,6 +69,15 @@ void CTvheadend::Start ( void )
   m_conn->Start();
 }
 
+void CTvheadend::Stop ( void )
+{
+  for (auto *dmx : m_dmx)
+    dmx->Close();
+
+  m_conn->Stop();
+  StopThread(0);
+}
+
 /* **************************************************************************
  * Miscellaneous
  * *************************************************************************/
@@ -1690,13 +1695,15 @@ void* CTvheadend::Process ( void )
     // this is a bit horrible, but meh
     bool bSuccess = m_queue.Pop(msg, 2000);
 
+    if (IsStopped())
+      continue;
+
     // check for expired predictive tuning subscriptions and close those
     CloseExpiredSubscriptions();
 
-    if (!bSuccess)
-      continue;
-    if (!msg.GetMessage())
+    if (!bSuccess || !msg.GetMessage())
       continue;
+
     method = msg.GetMethod().c_str();
 
     SHTSPEventList eventsCopy;
@@ -1786,6 +1793,9 @@ void* CTvheadend::Process ( void )
     /* Manual delete rather than waiting */
     msg.ClearMessage();
 
+    if (IsStopped())
+      continue;
+
     /* Process events
      * Note: due to potential deadly embrace this must be done without the
      *       m_mutex held!
@@ -1814,8 +1824,7 @@ void* CTvheadend::Process ( void )
     }
   }
 
-  /* Local */
-  return NULL;
+  return nullptr;
 }
 
 void CTvheadend::TriggerChannelGroupsUpdate()

src/Tvheadend.h

@@ -72,6 +72,7 @@ class CTvheadend
   ~CTvheadend() override;
 
   void Start ( void );
+  void Stop ( void );
 
   // IHTSPConnectionListener implementation
   void Disconnected() override;

src/client.cpp

@@ -126,6 +126,7 @@ ADDON_STATUS ADDON_GetStatus()
 void ADDON_Destroy()
 {
   CLockObject lock(g_mutex);
+  tvh->Stop();
   SAFE_DELETE(tvh);
   SAFE_DELETE(PVR);
   SAFE_DELETE(XBMC);
@@ -143,14 +144,12 @@ ADDON_STATUS ADDON_SetSetting
 
 void OnSystemSleep()
 {
-  if (tvh)
-    tvh->OnSleep();
+  tvh->OnSleep();
 }
 
 void OnSystemWake()
 {
-  if (tvh)
-    tvh->OnWake();
+  tvh->OnWake();
 }
 
 void OnPowerSavingActivated()