From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 30 Mar 2017 18:22:53 +0000 (+0200)
Subject: subscriptions: handle 'Continue even if descrambling fails' option correctly, fixes... 
X-Git-Tag: v4.2.1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b142383a7cf51180e00ebb1c13205c14d24338dc;p=thirdparty%2Ftvheadend.git

subscriptions: handle 'Continue even if descrambling fails' option correctly, fixes #4303
---

diff --git a/src/subscriptions.c b/src/subscriptions.c
index cc5bc2162..cf09a5cf5 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -558,7 +558,7 @@ subscription_input(void *opauqe, streaming_message_t *sm)
     }
 
     if(sm->sm_type == SMT_SERVICE_STATUS &&
-       sm->sm_code & TSS_ERRORS) {
+       sm->sm_code & (TSS_ERRORS|TSS_NO_ACCESS)) {
       // No, mark our subscription as bad_service
       // the scheduler will take care of things
       error = tss2errcode(sm->sm_code);
@@ -590,7 +590,7 @@ subscription_input(void *opauqe, streaming_message_t *sm)
   }
 
   if (sm->sm_type == SMT_SERVICE_STATUS &&
-      sm->sm_code & (TSS_TUNING|TSS_TIMEOUT)) {
+      sm->sm_code & (TSS_TUNING|TSS_TIMEOUT|TSS_NO_ACCESS)) {
     error = tss2errcode(sm->sm_code);
     if (error != SM_CODE_NO_ACCESS ||
         (s->ths_flags & SUBSCRIPTION_CONTACCESS) == 0) {