X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ef14f1f8cb8eb0d22c7f47d91174e96af85a6d8f..cdfd7a570b5b0813c8f62fc76deed949d7a11803:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index e52f8b87..f9263d82 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -115,13 +115,16 @@ class CableTransponderSearchSupport:
 
 	def cableTransponderSearchSessionClosed(self, *val):
 		print "cableTransponderSearchSessionClosed, val", val
-		self.resetTimeout()
 		self.cable_search_container.appClosed.remove(self.cableTransponderSearchClosed)
 		self.cable_search_container.dataAvail.remove(self.getCableTransponderData)
+		if val and len(val):
+			if val[0]:
+				self.setCableTransponderSearchResult(self.__tlist)
+			else:
+				self.cable_search_container.sendCtrlC()
+				self.setCableTransponderSearchResult(None)
 		self.cable_search_container = None
 		self.cable_search_session = None
-		if val and len(val) and val[0]:
-			self.setCableTransponderSearchResult(self.__tlist)
 		self.__tlist = None
 		self.cableTransponderSearchFinished()
 
@@ -157,25 +160,12 @@ class CableTransponderSearchSupport:
 				parm.modulation = qam[data[4]]
 				parm.inversion = inv[data[5]]
 				self.__tlist.append(parm)
-		tmpstr = _("Try to find used Transponders in cable network.. please wait...")
-		tmpstr += "\n\n"
-		tmpstr += data[1]
-		tmpstr += " kHz "
-		tmpstr += data[0]
-		self.cable_search_session["text"].setText(tmpstr)
-		
-	def setTimeout(self):
-		try:
-			self.oldtimeoutvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
-			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
-		except:
-			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"		
-		
-	def resetTimeout(self):
-		try:
-			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(self.oldtimeoutvalue)
-		except:
-			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+			tmpstr = _("Try to find used Transponders in cable network.. please wait...")
+			tmpstr += "\n\n"
+			tmpstr += data[1]
+			tmpstr += " kHz "
+			tmpstr += data[0]
+			self.cable_search_session["text"].setText(tmpstr)
 
 	def startCableTransponderSearch(self, nim_idx):
 		if not self.tryGetRawFrontend(nim_idx):
@@ -261,7 +251,6 @@ class CableTransponderSearchSupport:
 		self.cable_search_container.execute(cmd)
 		tmpstr = _("Try to find used transponders in cable network.. please wait...")
 		tmpstr += "\n\n..."
-		self.setTimeout()
 		self.cable_search_session = self.session.openWithCallback(self.cableTransponderSearchSessionClosed, MessageBox, tmpstr, MessageBox.TYPE_INFO)
 
 class DefaultSatLists(DefaultWizard):
@@ -846,7 +835,10 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		self.tlist = tlist
 
 	def cableTransponderSearchFinished(self):
-		self.startScan(self.tlist, self.flags, self.feid)
+		if self.tlist is None:
+			self.tlist = []
+		else:
+			self.startScan(self.tlist, self.flags, self.feid)
 
 	def startScan(self, tlist, flags, feid):
 		if len(tlist):
@@ -1012,7 +1004,8 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 				self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
 
 	def setCableTransponderSearchResult(self, tlist):
-		self.scanList.append({"transponders": tlist, "feid": self.feid, "flags": self.flags})
+		if tlist is not None:
+			self.scanList.append({"transponders": tlist, "feid": self.feid, "flags": self.flags})
 
 	def cableTransponderSearchFinished(self):
 		self.buildTransponderList()