From 95322c61b68a5e912fec580fe1e66e272457d96b Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Mon, 18 Apr 2011 22:14:14 +0200 Subject: [PATCH] pvr: the end margin wasn't used on timers in all situations. fixed --- xbmc/pvr/timers/PVRTimerInfoTag.cpp | 2 +- xbmc/settings/GUISettings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.cpp b/xbmc/pvr/timers/PVRTimerInfoTag.cpp index d241cf110da96..739ad9653c24a 100644 --- a/xbmc/pvr/timers/PVRTimerInfoTag.cpp +++ b/xbmc/pvr/timers/PVRTimerInfoTag.cpp @@ -464,7 +464,7 @@ CPVRTimerInfoTag *CPVRTimerInfoTag::CreateFromEpg(const CPVREpgInfoTag &tag) if (!iMarginStart) iMarginStart = 5; /* default to 5 minutes */ - int iMarginStop = g_guiSettings.GetInt("pvrrecord.marginstop"); + int iMarginStop = g_guiSettings.GetInt("pvrrecord.marginend"); if (!iMarginStop) iMarginStop = 10; /* default to 10 minutes */ diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp index 38576a6dc1d88..9c0139d0c2cca 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -831,7 +831,7 @@ void CGUISettings::Initialize() AddInt(pvrr, "pvrrecord.defaultpriority", 19173, 50, 1, 1, 100, SPIN_CONTROL_INT_PLUS); AddInt(pvrr, "pvrrecord.defaultlifetime", 19174, 99, 1, 1, 365, SPIN_CONTROL_INT_PLUS, MASK_DAYS); AddInt(pvrr, "pvrrecord.marginstart", 19175, 2, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS); - AddInt(pvrr, "pvrrecord.marginstop", 19176, 10, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS); + AddInt(pvrr, "pvrrecord.marginend", 19176, 10, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_MINS); } CGUISettings::~CGUISettings(void)