From: xhaggi <sascha.woo@gmail.com>
Date: Thu, 21 Feb 2013 00:12:43 +0000 (+0100)
Subject: cwc: reset prefcapid if service can't be descrambled(cherry picked from commit 667e1c... 
X-Git-Tag: 3.4beta1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4d133f75b9e1062c7a23fd37f0cc98a2a975e0;p=thirdparty%2Ftvheadend.git

cwc: reset prefcapid if service can't be descrambled(cherry picked from commit 667e1c2bad610fdfd443d73b0b945c7c848bfa5c)
---

diff --git a/src/cwc.c b/src/cwc.c
index 5de7b8399..6a0538ade 100644
--- a/src/cwc.c
+++ b/src/cwc.c
@@ -835,12 +835,17 @@ forbid:
 	   "Req delay: %"PRId64" ms)",
 	   t->s_svcname, seq, delay);
     ct->cs_keystate = CS_FORBIDDEN;
+
+    /* reset prefcapid if descrambling fails */
+    t->s_prefcapid = 0;
+    service_request_save(t, 0);
+
     return;
 
   } else {
 
     ct->cs_okchannel = es->es_channel;
-    tvhlog(LOG_DEBUG, "cwc",  "es->es_nok %d      t->tht_prefcapid %d", es->es_nok, t->s_prefcapid);
+    tvhlog(LOG_DEBUG, "cwc", "es->es_nok %d, t->tht_prefcapid %d", es->es_nok, t->s_prefcapid);
     if(es->es_nok == 1 || t->s_prefcapid == 0) {
       t->s_prefcapid = ct->cs_okchannel;
       service_request_save(t, 0);