pvr: the end margin wasn't used on timers in all situations. fixed

margro · Apr 18, 2011 · 95322c6 · 95322c6
1 parent 6b52b16
commit 95322c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)