X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FPluginComponent.py;h=5e439fdfea437eb0402e121dbfdc40baea843825;hb=1df738024ff38562468f819dcba1687a2cda8892;hp=6e357cd0431aa3367f10ad4a71644625b7e37ab4;hpb=76e5181cade262b86610dcc851bcb4452196ccdc;p=vuplus_dvbapp

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644
new mode 100755
index 6e357cd..5e439fd
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -46,7 +46,7 @@ class PluginComponent:
 			for pluginname in os_listdir(directory_category):
 				path = directory_category + "/" + pluginname
 				if os_path.isdir(path):
-					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
+					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.pyo") or fileExists(path + "/plugin.py"):
 						try:
 							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
@@ -96,9 +96,9 @@ class PluginComponent:
 		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)