diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-01 21:38:07 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-01 21:38:07 +0000 |
| commit | 7f088b2e0ec5051c3b9b9a1942198f0be28f315b (patch) | |
| tree | 81ff377dca05dd34872806f28cd325e8e0d8a7c3 /lib/python/Plugins | |
| parent | f21ed7557f028e334810bf1094251f93520dce2a (diff) | |
| download | enigma2-7f088b2e0ec5051c3b9b9a1942198f0be28f315b.tar.gz enigma2-7f088b2e0ec5051c3b9b9a1942198f0be28f315b.zip | |
restart previous running services in onClose event
remove some debug output
Diffstat (limited to 'lib/python/Plugins')
| -rw-r--r-- | lib/python/Plugins/Extensions/CutListEditor/plugin.py | 5 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py | 11 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/Satfinder/plugin.py | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index 7ebc42b5..c3456675 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -213,6 +213,10 @@ class CutListEditor(Screen, InfoBarBase, InfoBarSeek, InfoBarCueSheetSupport, He # to track new entries we save the last version of the cutlist self.last_cuts = [ ] self.cut_start = None + self.onClose.append(self.__onClose) + + def __onClose(self): + self.session.nav.playService(self.old_service) def showTutorial(self): if not self.tutorial_seen: @@ -258,7 +262,6 @@ Then seek to the end, press OK, select 'end cut'. That's it. self.removeMark(m) def exit(self): - self.session.nav.playService(self.old_service) self.close() def getCutlist(self): diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index 90de8b2f..4ade7fe0 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -125,15 +125,20 @@ class PositionerSetup(Screen): self.statusTimer = eTimer() self.statusTimer.callback.append(self.updateStatus) self.statusTimer.start(50, False) + self.onClose.append(self.__onClose) + + def __onClose(self): + self.session.nav.playService(self.oldref) def restartPrevService(self, yesno): if yesno: if self.frontend: self.frontend = None del self.raw_channel - self.session.nav.playService(self.oldref) - self.close(None) - + else: + self.oldref=None + self.close(None) + def keyCancel(self): if self.oldref: self.session.openWithCallback(self.restartPrevService, MessageBox, _("Zap back to service before positioner setup?"), MessageBox.TYPE_YESNO) diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py index 90650406..d6d967d2 100644 --- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py @@ -115,6 +115,10 @@ class Satfinder(ScanSetup): self["introduction"].setText("") self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100) self.initcomplete = True + self.onClose.append(self.__onClose) + + def __onClose(self): + self.session.nav.playService(self.oldref) def createSetup(self): self.typeOfTuningEntry = None @@ -227,7 +231,8 @@ class Satfinder(ScanSetup): if self.frontend: self.frontend = None del self.raw_channel - self.session.nav.playService(self.oldref) + else: + self.oldref = None self.close(None) def keyCancel(self): |