DVR: try to fix missing channel assignments

tvheadend · Apr 11, 2016 · 1cc14cd · 1cc14cd
1 parent 58966cd
commit 1cc14cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);