X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c0ebc011a78dd85727b3d91de8cbf271a25b8819..64cfba23aba53b4ab3933284b2a4a9ef5ec68e26:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644
new mode 100755
index d72e2af3..c91d6ad5
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -63,7 +63,7 @@ class PluginComponent:
 							continue
 
 						# allow single entry not to be a list
-						if type(plugins) is not list:
+						if not isinstance(plugins, list):
 							plugins = [ plugins ]
 
 						for p in plugins:
@@ -91,14 +91,14 @@ class PluginComponent:
 	def getPlugins(self, where):
 		"""Get list of plugins in a specific category"""
 
-		if type(where) is not list:
+		if not isinstance(where, list):
 			where = [ where ]
 		res = [ ]
 
 		for x in where:
-			for p in self.plugins.get(x, [ ]):
-				res.append(p)
-		return res
+			res.extend(self.plugins.get(x, [ ]))
+
+		return  res
 
 	def getPluginsForMenu(self, menuid):
 		res = [ ]
@@ -121,7 +121,7 @@ class PluginComponent:
 		wakeup = -1
 		for p in self.pluginList:
 			current = p.getWakeupTime()
-			if current > -1 and wakeup < current:
+			if current > -1 and (wakeup > current or wakeup == -1):
 				wakeup = current
 		return int(wakeup)