diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 12:59:08 +0200 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 12:59:08 +0200 |
| commit | ef8469a63bbe601f4e1ac0bb68226e25070a1ce4 (patch) | |
| tree | af91c82739202d067e975bb6be3b033e7cb1edd8 /lib/python/Plugins | |
| parent | 5fc72d747469d805943e5310dcc6bc9e748300e6 (diff) | |
| parent | 33d0b53a0b4949534d09698b29bcdd6fe2446269 (diff) | |
| download | enigma2-ef8469a63bbe601f4e1ac0bb68226e25070a1ce4.tar.gz enigma2-ef8469a63bbe601f4e1ac0bb68226e25070a1ce4.zip | |
Merge commit 'origin/bug_563_fix_backuprestore_crash'
Diffstat (limited to 'lib/python/Plugins')
| -rwxr-xr-x | lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml | 2 | ||||
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml index a10840da..3e2a3f6e 100755 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml @@ -6,7 +6,7 @@ <info language="en"> <author>Dream Multimedia</author> <name>GraphMultiEPG</name> - <packagename>eenigma2-plugin-extensions-graphmultiepg</packagename> + <packagename>enigma2-plugin-extensions-graphmultiepg</packagename> <shortdescription>GraphMultiEPG shows a graphical timeline EPG.</shortdescription> <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description> <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" /> diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py index dcff3ca2..7bd7d7a2 100755 --- a/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py @@ -251,8 +251,9 @@ class RestoreMenu(Screen): def KeyOk(self): if (self.exe == False) and (self.entry == True): self.sel = self["filelist"].getCurrent() - self.val = self.path + "/" + self.sel - self.session.openWithCallback(self.startRestore, MessageBox, _("Are you sure you want to restore\nfollowing backup:\n") + self.sel + _("\nSystem will restart after the restore!")) + if self.sel: + self.val = self.path + "/" + self.sel + self.session.openWithCallback(self.startRestore, MessageBox, _("Are you sure you want to restore\nfollowing backup:\n") + self.sel + _("\nSystem will restart after the restore!")) def keyCancel(self): self.close() @@ -265,8 +266,9 @@ class RestoreMenu(Screen): def deleteFile(self): if (self.exe == False) and (self.entry == True): self.sel = self["filelist"].getCurrent() - self.val = self.path + "/" + self.sel - self.session.openWithCallback(self.startDelete, MessageBox, _("Are you sure you want to delete\nfollowing backup:\n" + self.sel )) + if self.sel: + self.val = self.path + "/" + self.sel + self.session.openWithCallback(self.startDelete, MessageBox, _("Are you sure you want to delete\nfollowing backup:\n" + self.sel )) def startDelete(self, ret = False): if (ret == True): |