aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2019-01-25 10:55:04 +0100
committerKai Sommerfeld <kai.sommerfeld@gmx.com>2019-01-26 12:13:00 +0100
commit0ed6d00232a2db89e9cd316bb2a17323ae11ef21 (patch)
tree07f92fb88cd0620e1ad678b77fc2e031c9fb7bce
parentf60d19098bfe4488a902e63f5a862026417859d0 (diff)
[PVR] Fix CPVRClients::GetTimerTypes not to overwrite in multi-client setups.
-rw-r--r--xbmc/pvr/addons/PVRClients.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp
index 97e7d0fd76..34d7f54ef5 100644
--- a/xbmc/pvr/addons/PVRClients.cpp
+++ b/xbmc/pvr/addons/PVRClients.cpp
@@ -476,7 +476,11 @@ bool CPVRClients::GetTimers(CPVRTimersContainer *timers, std::vector<int> &faile
PVR_ERROR CPVRClients::GetTimerTypes(CPVRTimerTypes& results) const
{
return ForCreatedClients(__FUNCTION__, [&results](const CPVRClientPtr &client) {
- return client->GetTimerTypes(results);
+ CPVRTimerTypes types;
+ PVR_ERROR ret = client->GetTimerTypes(types);
+ if (ret == PVR_ERROR_NO_ERROR)
+ results.insert(results.end(), types.begin(), types.end());
+ return ret;
});
}