4 files changed, 15 insertions, 5 deletions
diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 8bd8e759..2494ca08 100644
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -289,6 +289,7 @@ class EPGList(HTMLComponent, GUIComponent):
 			else:
 				assert(type == 0)
 				list.sort(key=lambda x: x[2])
+			self.l.invalidate()
 			self.moveToEventId(event_id)
 
 	def getSelectedEventId(self):
diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 2a7bd995..ddf871a7 100755
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -7,7 +7,7 @@ from Tools.KeyBindings import queryKeyBinding, getKeyDescription
 # [ ( actionmap, context, [(action, help), (action, help), ...] ), (actionmap, ... ), ... ]
 
 class HelpMenuList(GUIComponent):
-	def __init__(self, list, callback):
+	def __init__(self, helplist, callback):
 		GUIComponent.__init__(self)
 		self.onSelChanged = [ ]
 		self.l = eListboxPythonMultiContent()
@@ -15,7 +15,7 @@ class HelpMenuList(GUIComponent):
 		self.extendedHelp = False
 
 		l = [ ]
-		for (actionmap, context, actions) in list:
+		for (actionmap, context, actions) in helplist:
 			for (action, help) in actions:
 				entry = [ ]
 
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 4be10d53..6dc49dcf 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -287,8 +287,8 @@ class SecConfigure:
 						sec.setLNBSatCR(manufacturer.scr[product_name].index)
 						sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
 					elif currLnb.unicable.value == "unicable_lnb":
-						manufacturer_name = currLnb.unicableMatrixManufacturer.value
-						manufacturer = currLnb.unicableMatrix[manufacturer_name]
+						manufacturer_name = currLnb.unicableLnbManufacturer.value
+						manufacturer = currLnb.unicableLnb[manufacturer_name]
 						product_name = manufacturer.product.value
 						sec.setLNBSatCR(manufacturer.scr[product_name].index)
 						sec.setLNBSatCRvco(manufacturer.vco[product_name][manufacturer.scr[product_name].index].value*1000)
diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index cf02459d..cf505022 100644
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -1,11 +1,12 @@
 import NavigationInstance
-from time import localtime
+from time import localtime, mktime, gmtime
 from ServiceReference import ServiceReference
 from enigma import iServiceInformation, eServiceCenter, eServiceReference
 
 class TimerSanityCheck:
 	def __init__(self, timerlist, newtimer=None):
 		print "sanitycheck"
+		self.localtimediff = 25*3600 - mktime(gmtime(25*3600))
 		self.timerlist = timerlist
 		self.newtimer = newtimer
 		self.simultimer = []
@@ -70,6 +71,10 @@ class TimerSanityCheck:
 			rflags = ((rflags & 0x7F)>> 3)|((rflags & 0x07)<<4)
 			if rflags:
 				begin = self.newtimer.begin % 86400 # map to first day
+				if (self.localtimediff > 0) and ((begin + self.localtimediff) > 86400):
+					rflags = ((rflags >> 1)& 0x3F)|((rflags << 6)& 0x40)
+				elif (self.localtimediff < 0) and (begin < self.localtimediff):
+					rflags = ((rflags << 1)& 0x7E)|((rflags >> 6)& 0x01)
 				while rflags: # then arrange on the week
 					if rflags & 1:
 						self.rep_eventlist.append((begin, -1))
@@ -87,6 +92,10 @@ class TimerSanityCheck:
 					rflags = timer.repeated
 					rflags = ((rflags & 0x7F)>> 3)|((rflags & 0x07)<<4)
 					begin = timer.begin % 86400 # map all to first day
+					if (self.localtimediff > 0) and ((begin + self.localtimediff) > 86400):
+						rflags = ((rflags >> 1)& 0x3F)|((rflags << 6)& 0x40)
+					elif (self.localtimediff < 0) and (begin < self.localtimediff):
+						rflags = ((rflags << 1)& 0x7E)|((rflags >> 6)& 0x01)
 					while rflags:
 						if rflags & 1:
 							self.rep_eventlist.append((begin, idx))