diff options
| author | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-24 23:47:30 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@2mac.waldobjekt.org> | 2009-06-24 23:47:30 +0200 |
| commit | 69ad5b69a69b3a9006824832afb3fa8cecb061b9 (patch) | |
| tree | c51286d5a6154f0bd93000d8661aa9f4f358d08d /lib | |
| parent | 5b3739ccccddb795ca7e75e60f202cbce5c78144 (diff) | |
| parent | 77bc87782b4c84b835649f6125b89de33d12c46e (diff) | |
| download | enigma2-69ad5b69a69b3a9006824832afb3fa8cecb061b9.tar.gz enigma2-69ad5b69a69b3a9006824832afb3fa8cecb061b9.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb_ci/dvbci.cpp | 2 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/Process.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 037103cf..bde394aa 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -605,6 +605,8 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler) else tmp->linked_next = 0; } + else // removed old base slot.. update ptr + base_slot = slot->linked_next; slot->linked_next = 0; slot->user_mapped = false; } diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 9a37c14e..74ffbde7 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -395,8 +395,12 @@ class PreviewTask(Task): if self.job.menupreview: self.previewProject() else: - from Tools import Notifications - Notifications.AddNotificationWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) + import Screens.Standby + if Screens.Standby.inStandby: + self.previewCB(False) + else: + from Tools import Notifications + Notifications.AddNotificationWithCallback(self.previewCB, MessageBox, _("Do you want to preview this DVD before burning?"), timeout = 60, default = False) def abort(self): self.finish(aborted = True) |