]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: fix the code logic for s_dvb_forcecaid == 0xffff
authorJaroslav Kysela <perex@perex.cz>
Thu, 16 Nov 2017 13:18:40 +0000 (14:18 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 16 Nov 2017 13:18:40 +0000 (14:18 +0100)
src/descrambler/descrambler.c

index eb971ce294ccf2facf2a1856c267137c3b7cb280..653a4e314d7cafe20cd0781f31aa925a3a710c86 100644 (file)
@@ -394,11 +394,11 @@ descrambler_service_start ( service_t *t )
       tvhtrace(LS_DESCRAMBLER, "using multipid for \"%s\"", t->s_nicename);
     dr->dr_skip = 0;
     dr->dr_force_skip = 0;
+    if (t->s_dvb_forcecaid == 0xffff)
+      dr->dr_descramble = descrambler_pass;
   }
 
-  if (t->s_dvb_forcecaid == 0xffff)
-    dr->dr_descramble = descrambler_pass;
-  else
+  if (t->s_dvb_forcecaid != 0xffff)
     caclient_start(t);
 }