descrambler: fix the key change for multipid

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 2e58a519407163246a5b64b78ac20b34e2ed30ad..24dcec58672b7becbd8ea68587c8b79fcffb2a6a 100644 (file)
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -747,11 +747,11 @@ key_started( th_descrambler_runtime_t *dr, uint8_t ki )
 }
 
 static void
-key_flush( th_descrambler_key_t *tk, service_t *t )
+key_flush( th_descrambler_key_t *tk, service_t *t, int force )
 {
-  /* update the keys */
-  if (tk->key_changed) {
+  if (tk->key_changed || force) {
     tk->key_csa.csa_flush(&tk->key_csa, (mpegts_service_t *)t);
+    /* update the keys */
     if (tk->key_changed & 1)
       tvhcsa_set_key_even(&tk->key_csa, tk->key_data[0]);
     if (tk->key_changed & 2)
@@ -772,7 +772,8 @@ key_find_struct( th_descrambler_runtime_t *dr,
     tk = &dr->dr_keys[i];
     if (tk->key_pid == pid) {
       if (tk != tk_old && tk_old)
-        key_flush(tk_old, t);
+        key_flush(tk_old, t, 1);
+      key_flush(tk, t, 0);
       return tk;
     }
   }
@@ -852,7 +853,7 @@ descrambler_descramble ( service_t *t,
 
     if (!dr->dr_key_multipid) {
       tk = &dr->dr_keys[0];
-      key_flush(tk, t);
+      key_flush(tk, t, 0);
     } else {
       tk = NULL;
     }