Merge pull request #1691 from knaerzche/fix-translate-wrapper

[KodiProps] Fix multi wrapper separator
xbmc · Oct 13, 2024 · 933a28d · 933a28d
2 parents 8720557 + 365ffa4
commit 933a28d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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<Wrapper> TranslateWrapper(std::string_view wrapper)
 {
  const std::vector<std::string> wrappers = STRING::SplitToVec(wrapper, ',');