From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 11 Feb 2017 16:28:57 +0000 (+0100)
Subject: descrambler: fix forced CAID 0xffff (external descrambling), fixes #4193
X-Git-Tag: v4.2.1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef89ef8b33f082f4829f8c57d9f656b312f45988;p=thirdparty%2Ftvheadend.git

descrambler: fix forced CAID 0xffff (external descrambling), fixes #4193
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 20e46de80..63210892b 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -294,8 +294,11 @@ descrambler_service_start ( service_t *t )
   dvbcam_service_start(t);
 #endif
 
-  if (((mpegts_service_t *)t)->s_dvb_forcecaid == 0xffff)
+  if (((mpegts_service_t *)t)->s_dvb_forcecaid == 0xffff) {
+    pthread_mutex_lock(&t->s_stream_mutex);
     descrambler_external(t, 1);
+    pthread_mutex_unlock(&t->s_stream_mutex);
+  }
 }
 
 void