parsing for /etc/timezone.xml added

[enigma2.git] / lib / python / Screens / MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index ad93a5ebfab1d867e9b0705bbf561be2ed7ea312..ce3a9732b2a51d9b409faa38ab04a10592b282f5 100644 (file)
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -67,7 +67,7 @@ class MovieSelection(Screen):
                
                self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
                        {
-                               "cancel": self.close,
+                               "cancel": self.abort,
                                "ok": self.movieSelected,
                                "contextMenu": self.doContext,
                        })
@@ -77,8 +77,10 @@ class MovieSelection(Screen):
                return self["list"].getCurrent()[0]
 
        def movieSelected(self):
-               self.session.nav.playService(self.getCurrent())
-               self.close()
+               self.close(self.getCurrent())
 
        def doContext(self):
                self.session.open(ChannelContextMenu, self, self.getCurrent())
+
+       def abort(self):
+               self.close(None)