Merge pull request #457 from AlwinEsch/Matrix-change

[Matrix] fix problem with pvr instance thread, during destruct
kodi-pvr · Jun 15, 2020 · 0585290 · 0585290
2 parents 86e47fb + d03dc9f
commit 0585290
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="7.0.0"
+  version="7.0.1"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+7.0.1
+- Fix hang during addon stop
+
 7.0.0
 - Update PVR API 7.0.0
 - Rework addon to support new API interface

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
@@ -52,6 +52,8 @@ CTvheadend::CTvheadend(KODI_HANDLE instance, const std::string& kodiVersion)
 
 CTvheadend::~CTvheadend()
 {
+  Stop();
+
   for (auto* dmx : m_dmx)
     delete dmx;
 

diff --git a/src/Tvheadend.h b/src/Tvheadend.h
@@ -54,10 +54,10 @@ typedef P8PLATFORM::SyncedBuffer<tvheadend::HTSPMessage> HTSPMessageQueue;
 /*
  * Root object for Tvheadend connection
  */
-class CTvheadend : public kodi::addon::CInstancePVRClient,
-                   public P8PLATFORM::CThread,
-                   public tvheadend::IHTSPConnectionListener,
-                   public tvheadend::IHTSPDemuxPacketHandler
+class ATTRIBUTE_HIDDEN CTvheadend : public kodi::addon::CInstancePVRClient,
+                                    public P8PLATFORM::CThread,
+                                    public tvheadend::IHTSPConnectionListener,
+                                    public tvheadend::IHTSPDemuxPacketHandler
 {
 public:
   CTvheadend(KODI_HANDLE instance, const std::string& kodiVersion);