From bb8cf4610af37d4f89555f96990ef1b9c7d58acd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Nov 2023 21:05:11 +0100 Subject: [PATCH 1/1] Fix checking for existing key_id; _key_id would always be set because MXF::set_key() sets it. --- src/smpte_subtitle_asset.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index ea1d7426..c1138f23 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -306,10 +306,11 @@ SMPTESubtitleAsset::set_key (Key key) have read that file. */ auto const had_key = static_cast(_key); + auto const had_key_id = static_cast(_key_id); MXF::set_key (key); - if (!_key_id || !_file || had_key) { + if (!had_key_id || !_file || had_key) { /* Either we don't have any data to read, it wasn't encrypted, or we've already read it, so we don't need to do anything else. -- 2.30.2