From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 26 Dec 2015 17:43:32 +0000 (+0100)
Subject: descrambler: handle constcw initialization for forced CAIDs, too, fixes #2942
X-Git-Tag: v4.2.1~1276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eec4077f3efdd95fe92f739ab20a27052e7f163f;p=thirdparty%2Ftvheadend.git

descrambler: handle constcw initialization for forced CAIDs, too, fixes #2942
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 66d719ae6..76318290f 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -260,6 +260,14 @@ descrambler_service_start ( service_t *t )
     if (count == 0)
       return;
 
+  } else {
+
+    for (p = constcw_table; *p; p++)
+      if (*p == ((mpegts_service_t *)t)->s_dvb_forcecaid) {
+        constcw = 1;
+        break;
+      }
+
   }
 
   ((mpegts_service_t *)t)->s_dvb_mux->mm_descrambler_flush = 0;