X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..f06af856d2a0210bf7931f800ecb7ad13fbf659a:/lib/python/Screens/ChoiceBox.py

diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 37729887..0436f66d 100644
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -1,8 +1,6 @@
 from Screens.Screen import Screen
-from Screens.MessageBox import MessageBox
 from Components.ActionMap import NumberActionMap
 from Components.Label import Label
-from Components.MenuList import MenuList
 from Components.ChoiceList import ChoiceEntryComponent, ChoiceList
 
 class ChoiceBox(Screen):
@@ -74,7 +72,11 @@ class ChoiceBox(Screen):
 
 	# runs the current selected entry
 	def go(self):
-		self.goEntry(self["list"].l.getCurrentSelection()[0])
+		cursel = self["list"].l.getCurrentSelection()
+		if cursel:
+			self.goEntry(cursel[0])
+		else:
+			self.cancel()
 
 	# runs a specific entry
 	def goEntry(self, entry):