Fix plugin on OpenATV with python 3.10

Taapat · Feb 19, 2022 · 95bd2d9 · 95bd2d9
1 parent 2379087
commit 95bd2d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Manager.py b/src/Manager.py
@@ -149,7 +149,7 @@ def camliststart(self):
 			self.camliststart()
 
 	def camactive(self, result, retval, extra_args):
-		if result.decode("utf-8").strip():
+		if result.strip():
 			self.createcamlist()
 		else:
 			self.actcam = "none"
@@ -159,7 +159,7 @@ def camactive(self, result, retval, extra_args):
 			self.checkConsole.ePopen("echo 1", self.camactivefromlist, "none")
 
 	def camactivefromlist(self, result, retval, extra_args):
-		if result.decode("utf-8").strip():
+		if result.strip():
 			self.actcam = extra_args
 			self.createcamlist()
 		else:

diff --git a/src/plugin.py b/src/plugin.py
@@ -36,7 +36,9 @@ def camnotrun(self):
 		self.Console.ePopen("ps", self.checkprocess)
 
 	def checkprocess(self, result, retval, extra_args):
-		processes = result.decode("utf-8").lower()
+		if hasattr(result, 'decode'):
+			result = result.decode("utf-8")
+		processes = result.lower()
 		camlist = ["oscam", "mgcamd", "wicard", "camd3", "mcas", "cccam",
 				"gbox", "mpcs", "mbox", "newcs", "vizcam", "rucam"]
 		camlist.insert(0, config.plugins.AltSoftcam.actcam.value)