X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e77779c4822c7c860f5006b24445960722c7a46e..40c7c611cfab3dfe403a041e4921805cb107adf4:/lib/python/Screens/ChoiceBox.py

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 522ee3c5..9711da2d 100644
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -61,14 +61,16 @@ class ChoiceBox(Screen):
 	def up(self):
 		while 1:
 			self["list"].instance.moveSelection(self["list"].instance.moveUp)
-			if self["list"].l.getCurrentSelection()[0][0] != "--":
+			if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == 0:
 				break
 		
 	def down(self):
 		while 1:
 			self["list"].instance.moveSelection(self["list"].instance.moveDown)
-			if self["list"].l.getCurrentSelection()[0][0] != "--":
-				break	
+			if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == len(self["list"].list) - 1:
+				break
+
+
 	def keyNumberGlobal(self, number):
 		print "pressed", number
 		if self.keymap.has_key(str(number)):