From b5c3db5f8af9c6de71a0dadd3cc9e13ead7f06d6 Mon Sep 17 00:00:00 2001
From: acid-burn <acid-burn@opendreambox.org>
Date: Sun, 25 Jul 2010 22:35:19 +0200
Subject: [PATCH] Softwaremanager: fix potential crash when trying to delete
 from empty list. Graphmultiepg: fix typo inside metafile. fixes #563

---
 .../GraphMultiEPG/meta/plugin_graphmultiepg.xml        |  2 +-
 .../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):
-- 
2.30.2