diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-02 11:00:13 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-02 11:00:13 +0100 |
| commit | 2fa166a61a60aed8248b74a838a2d077720156e9 (patch) | |
| tree | 832c5114edf834a2643d42d8aee21d0e14ba6460 /lib/python | |
| parent | 541bb75365f3594dccea757a8183df6ac0e8e5e8 (diff) | |
| parent | 245c0a7eaa086ae89b8c56b0766f94d94a76da79 (diff) | |
| download | enigma2-2fa166a61a60aed8248b74a838a2d077720156e9.tar.gz enigma2-2fa166a61a60aed8248b74a838a2d077720156e9.zip | |
Merge remote branch 'origin/bug_348_dvdburn_residenttask' into experimental
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDBurn/Process.py | 1 | ||||
| -rwxr-xr-x | lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py | 2 | ||||
| -rwxr-xr-x | lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 44075d64..642a898d 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -264,6 +264,7 @@ class WaitForResidentTasks(Task): def run(self, callback): print "waiting for %d resident task(s) %s to finish..." % (len(self.job.resident_tasks),str(self.job.resident_tasks)) + self.callback = callback if self.job.resident_tasks == 0: callback(self, []) diff --git a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py index c4289cb0..a1c38842 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py +++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py @@ -8,7 +8,6 @@ from Components.Sources.List import List from Components.Sources.StaticText import StaticText from Components.Sources.Progress import Progress from Components.FileList import FileList -from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT from Tools.Directories import fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS, SCOPE_HDD from Components.config import config, getConfigListEntry from Components.ConfigList import ConfigListScreen @@ -235,7 +234,6 @@ class ProjectSettings(Screen,ConfigListScreen): self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR) elif scope == "project": if self.project.loadProject(path): - configRef.setValue(path) self.initConfigList() else: self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR) diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py index c3f78d4a..0a664eba 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py @@ -9,7 +9,7 @@ from Components.Sources.StaticText import StaticText from Components.Sources.Progress import Progress from Components.FileList import FileList from Components.Pixmap import Pixmap -from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, ePicLoad +from enigma import ePicLoad from Tools.Directories import fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS, SCOPE_HDD from Components.config import config, getConfigListEntry, ConfigInteger, ConfigSubsection, ConfigSelection from Components.ConfigList import ConfigListScreen |