Merge pull request #576 from ksooo/fix-deleted-recordings-nexus

Fix deleted recordings
kodi-pvr · Feb 1, 2022 · 5486bce · 5486bce
2 parents 5cf998e + 14c7a3f
commit 5486bce
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
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="20.2.1"
+  version="20.2.2"
   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 @@
+v20.2.2
+- Fix deleted recordings not disappearing in Kodi until restart (regression introduced with v20.2.1)
+
 v20.2.1
 - Ignore recordings without a file (e.g. removed recordings).
 - When parsing recording add/update messages, always set the correct error string.

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
@@ -2309,7 +2309,20 @@ void CTvheadend::ParseRecordingAddOrUpdate(htsmsg_t* msg, bool bAdd)
   /* Ignore recordings without a file (e.g. removed recordings) */
   const char* error = htsmsg_get_str(msg, "error");
   if (error && (strstr(error, "missing") != nullptr))
+  {
+    const auto it = m_recordings.find(id);
+    if (it != m_recordings.end())
+    {
+      m_recordings.erase(it);
+
+      if (m_asyncState.GetState() > ASYNC_DVR)
+      {
+        TriggerTimerUpdate();
+        TriggerRecordingUpdate();
+      }
+    }
     return;
+  }
 
   /* Get/create entry */
   Recording& rec = m_recordings[id];