From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 16 Nov 2017 13:18:40 +0000 (+0100)
Subject: descrambler: fix the code logic for s_dvb_forcecaid == 0xffff
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2345f126beaf3c4d6208c667cfd78fdd219b4aa4;p=thirdparty%2Ftvheadend.git

descrambler: fix the code logic for s_dvb_forcecaid == 0xffff
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index eb971ce29..653a4e314 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -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);
 }