From 365ffa49c98f2a333cb34829e02bcd2ef443aff6 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 12 Oct 2024 16:00:54 +0200 Subject: [PATCH] [KodiProps] Fix multi wrapper separator According to the wiki, the separator for multiple wrappers is ',', not '+'. Fix it. Signed-off-by: Alex Bee --- src/CompKodiProps.cpp | 4 ++-- src/decrypters/HelperWv.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CompKodiProps.cpp b/src/CompKodiProps.cpp index 4d0f22647..96693204a 100644 --- a/src/CompKodiProps.cpp +++ b/src/CompKodiProps.cpp @@ -511,13 +511,13 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseDrmOldProps( else if (STRING::StartsWith(wrapperPrefix, "BJ")) { isJsonWrapper = true; - drmCfg.license.unwrapper = "base64+json"; + drmCfg.license.unwrapper = "base64,json"; jsonWrapperCfg = wrapperPrefix.substr(2); } else if (STRING::StartsWith(wrapperPrefix, "JB")) { isJsonWrapper = true; - drmCfg.license.unwrapper = "json+base64"; + drmCfg.license.unwrapper = "json,base64"; jsonWrapperCfg = wrapperPrefix.substr(2); } else if (STRING::StartsWith(wrapperPrefix, "J")) diff --git a/src/decrypters/HelperWv.cpp b/src/decrypters/HelperWv.cpp index c85afc000..95b1534d1 100644 --- a/src/decrypters/HelperWv.cpp +++ b/src/decrypters/HelperWv.cpp @@ -138,7 +138,7 @@ enum class Wrapper }; // \brief Translate a wrapper string in to relative vector of enum values. -// e.g. "json+base64" --> JSON, BASE64 +// e.g. "json,base64" --> JSON, BASE64 std::vector TranslateWrapper(std::string_view wrapper) { const std::vector wrappers = STRING::SplitToVec(wrapper, ',');