aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-11-08 19:14:59 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-11-08 19:14:59 +0100
commitc4e5a7dc0720e316df37f2ad9f0f1fce3873a52e (patch)
tree1d53f4fadbb1bfe43c56ede93e7bfd86f6b58403
parentee8b6bf0e14444534472d1620d8881eb8d78df47 (diff)
parent57f0f06b1e3235dfb6739a43bb95ab92c02f9574 (diff)
downloadenigma2-c4e5a7dc0720e316df37f2ad9f0f1fce3873a52e.tar.gz
enigma2-c4e5a7dc0720e316df37f2ad9f0f1fce3873a52e.zip
Merge branch 'master' into 3.0
-rw-r--r--lib/python/Screens/ScanSetup.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index ceaaf4bb..f9263d82 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -115,7 +115,6 @@ 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):
@@ -168,19 +167,6 @@ class CableTransponderSearchSupport:
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"
-
def startCableTransponderSearch(self, nim_idx):
if not self.tryGetRawFrontend(nim_idx):
self.session.nav.stopService()
@@ -265,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):