Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

Conflicts:

	lib/python/Screens/InfoBarGenerics.py

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 520d6d7a..0f6ee746 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -106,17 +106,18 @@ class PluginDownloadBrowser(Screen):
 		if sel is None:
 			return
 
-		if type(sel[0]) is str: # category
-			if sel[0] in self.expanded:
-				self.expanded.remove(sel[0])
+		sel = sel[0]
+		if isinstance(sel, str): # category
+			if sel in self.expanded:
+				self.expanded.remove(sel)
 			else:
-				self.expanded.append(sel[0])
+				self.expanded.append(sel)
 			self.updateList()
 		else:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel[0].name)
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel.name)
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel[0].name)
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel.name)
 
 	def runInstall(self, val):
 		if val: