From c192f6a655da8b4d3bfed8ba07577a5a38f363af Mon Sep 17 00:00:00 2001 From: TangoCash Date: Wed, 18 Oct 2017 12:50:34 +0200 Subject: [PATCH] ca_ci: in some situations missing scambled flag (thx dbo) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0dd25ef8fb040533d038372046ee1ce7020b9043 Author: TangoCash Date: 2017-10-18 (Wed, 18 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 72772f6..9f8cd3c 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -692,14 +692,20 @@ SlotIt cCA::FindFreeSlot(u64 TP, u8 source, u16 SID, ca_map_t camap, unsigned ch for (int j = 0; j < CI_MAX_MULTI; j++) { if ((*it)->TP == TP && (*it)->SID[j] == SID && (*it)->source == source) + { + (*it)->scrambled = scrambled; return it; + } } } for (it = slot_data.begin(); it != slot_data.end(); ++it) { if ((*it)->multi && (*it)->TP == TP && (*it)->source == source && (*it)->ci_use_count < CI_MAX_MULTI) - return it; + { + (*it)->scrambled = scrambled; + return it; + } } for (it = slot_data.begin(); it != slot_data.end(); ++it)