From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 11 Apr 2016 16:25:04 +0000 (+0200)
Subject: DVR: try to fix missing channel assignments
X-Git-Tag: v4.2.1~675
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cc14cdb2f3faa6ec652b67de406b1cc46ab739e;p=thirdparty%2Ftvheadend.git

DVR: try to fix missing channel assignments
---

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index f0edff51f..cb3d10dc4 100644
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -483,7 +483,8 @@ dvr_autorec_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (dae->dae_channel != ch) {
-    if (!channel_access(ch, dae->dae_id.in_access, 1))
+    if (dae->dae_id.in_access &&
+        !channel_access(ch, dae->dae_id.in_access, 1))
       return 0;
     if (dae->dae_channel)
       LIST_REMOVE(dae, dae_channel_link);
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index e4d7a15ef..5b52e28e0 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -2271,7 +2271,8 @@ dvr_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (de->de_channel != ch) {
-    if (!channel_access(ch, de->de_id.in_access, 1))
+    if (de->de_id.in_access &&
+        !channel_access(ch, de->de_id.in_access, 1))
       return 0;
     if (de->de_channel)
       LIST_REMOVE(de, de_channel_link);
diff --git a/src/dvr/dvr_timerec.c b/src/dvr/dvr_timerec.c
index c91aa89d4..00564560c 100644
--- a/src/dvr/dvr_timerec.c
+++ b/src/dvr/dvr_timerec.c
@@ -327,7 +327,8 @@ dvr_timerec_entry_class_channel_set(void *o, const void *v)
       return 1;
     }
   } else if (dte->dte_channel != ch) {
-    if (!channel_access(ch, dte->dte_id.in_access, 1))
+    if (dte->dte_id.in_access &&
+        !channel_access(ch, dte->dte_id.in_access, 1))
       return 0;
     if (dte->dte_channel)
       LIST_REMOVE(dte, dte_channel_link);