diff options
| -rw-r--r-- | xbmc/pvr/PVRManager.cpp | 2 | ||||
| -rw-r--r-- | xbmc/pvr/timers/PVRTimers.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index a41ae0a30d..4b36ddb0a8 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -746,7 +746,7 @@ bool CPVRManager::StartRecordingOnPlayingChannel(bool bOnOff) else if (!bOnOff && channel->IsRecording()) { /* delete active timers */ - bReturn = m_timers->DeleteTimersOnChannel(*channel, false, true); + bReturn = m_timers->DeleteTimersOnChannel(*channel, true, true); } } diff --git a/xbmc/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp index c51cf77c22..f22cf216a2 100644 --- a/xbmc/pvr/timers/PVRTimers.cpp +++ b/xbmc/pvr/timers/PVRTimers.cpp @@ -441,12 +441,9 @@ bool CPVRTimers::DeleteTimersOnChannel(const CPVRChannel &channel, bool bDeleteR { for (vector<CPVRTimerInfoTagPtr>::iterator timerIt = it->second->begin(); timerIt != it->second->end(); ) { - bool bDeleteActiveItem = !bCurrentlyActiveOnly || - (CDateTime::GetCurrentDateTime() > (*timerIt)->StartAsLocalTime() && - CDateTime::GetCurrentDateTime() < (*timerIt)->EndAsLocalTime()); + bool bDeleteActiveItem = !bCurrentlyActiveOnly || (*timerIt)->IsRecording(); bool bDeleteRepeatingItem = bDeleteRepeating || !(*timerIt)->m_bIsRepeating; - bool bChannelsMatch = (*timerIt)->ChannelNumber() == channel.ChannelNumber() && - (*timerIt)->m_bIsRadio == channel.IsRadio(); + bool bChannelsMatch = *(*timerIt)->ChannelTag() == channel; if (bDeleteActiveItem && bDeleteRepeatingItem && bChannelsMatch) { |