DVR: try to fix missing channel assignments

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index f0edff51febb4b8e32b2e8d1d045a84d5a99f28b..cb3d10dc44af3b7c9937daeaebeb93a95d9f2b80 100644 (file)
--- 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 e4d7a15efcccc173bc6c6263206a0df5b229290a..5b52e28e0b8eba51c423fa1b5f47ee14792b0a80 100644 (file)
--- 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 c91aa89d4abcafa18d9a5c8edc81ffbefcca7d7b..00564560c57d911467a2f92e8cc278740b753925 100644 (file)
--- 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);