Merge pull request xbmc#18947 from phunkyfish/pvr-json-broadcast-type

[pvr] fix epg retrieval which should be by database ID
johnrvt · Dec 19, 2020 · c9da8b4 · c9da8b4
2 parents f370a93 + 5166f59
commit c9da8b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/xbmc/interfaces/json-rpc/PVROperations.cpp b/xbmc/interfaces/json-rpc/PVROperations.cpp
@@ -395,8 +395,9 @@ JSONRPC_STATUS CPVROperations::AddTimer(const std::string &method, ITransportLay
  if (!CServiceBroker::GetPVRManager().IsStarted())
  return FailedToExecute;
 
- const std::shared_ptr<CPVREpgInfoTag> epgTag = CServiceBroker::GetPVRManager().EpgContainer().GetTagById(nullptr,
- parameterObject["broadcastid"].asUnsignedInteger());
+ const std::shared_ptr<CPVREpgInfoTag> epgTag =
+ CServiceBroker::GetPVRManager().EpgContainer().GetTagByDatabaseId(
+ parameterObject["broadcastid"].asInteger());
 
  if (!epgTag)
  return InvalidParams;
@@ -440,8 +441,9 @@ JSONRPC_STATUS CPVROperations::ToggleTimer(const std::string &method, ITransport
  if (!CServiceBroker::GetPVRManager().IsStarted())
  return FailedToExecute;
 
- const std::shared_ptr<CPVREpgInfoTag> epgTag = CServiceBroker::GetPVRManager().EpgContainer().GetTagById(nullptr,
- parameterObject["broadcastid"].asUnsignedInteger());
+ const std::shared_ptr<CPVREpgInfoTag> epgTag =
+ CServiceBroker::GetPVRManager().EpgContainer().GetTagByDatabaseId(
+ parameterObject["broadcastid"].asInteger());
 
  if (!epgTag)
  return InvalidParams;

diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-JSONRPC_VERSION 11.20.0
+JSONRPC_VERSION 11.20.1