From d039610c240c2e0056850a33530808fb0ae4cfff Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 16 Jun 2014 16:08:51 +0200
Subject: [PATCH] service: Improve the filtered components handling

---
 src/service.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/service.c b/src/service.c
index 5a59de13..7c4a0dc7 100644
--- a/src/service.c
+++ b/src/service.c
@@ -283,7 +283,7 @@ service_stop(service_t *t)
   /**
    * Clean up each stream
    */
-  TAILQ_FOREACH(st, &t->s_filt_components, es_link)
+  TAILQ_FOREACH(st, &t->s_components, es_link)
     stream_clean(st);
 
   t->s_status = SERVICE_IDLE;
@@ -491,7 +491,10 @@ service_start(service_t *t, int instance)
   t->s_scrambled_seen   = 0;
   t->s_start_time       = dispatch_clock;
 
+  pthread_mutex_lock(&t->s_stream_mutex);
   service_build_filter(t);
+  descrambler_caid_changed(t);
+  pthread_mutex_unlock(&t->s_stream_mutex);
 
   if((r = t->s_start_feed(t, instance)))
     return r;