fix bluescreen(segfault) in automatic service scan .. part2

[enigma2.git] / lib / python / Components / ServiceScan.py

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 575c03028f21a94a1c48ed59a0a652a051da1452..d812fddba75dd50b2ed0c728bd4e8245556c024a 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -44,7 +44,6 @@ class ServiceScan:
                                self.foundServices += self.scan.getNumServices()
                                self.execEnd()
                                self.run += 1
-                               self.doRun()
                                self.execBegin()
        
        def __init__(self, progressbar, text, servicelist, passNumber, scanList):
@@ -56,8 +55,6 @@ class ServiceScan:
                self.scanList = scanList
                self.run = 0
                
-               self.doRun()
-               
        def doRun(self):
                self.scan = eComponentScan()
                
@@ -72,12 +69,14 @@ class ServiceScan:
        def updatePass(self):
                size = len(self.scanList)
                if size > 1:
-                       self.passNumber.setText(_("pass") + " " + str(self.run + 1) + "/" + str(size) + " (" + _("NIM") + " " + str(self.scanList[self.run]["feid"]) + ")")
+                       self.passNumber.setText(_("pass") + " " + str(self.run + 1) + "/" + str(size) + " (" + _("Tuner") + " " + str(self.scanList[self.run]["feid"]) + ")")
                
        def execBegin(self):
+               self.doRun()
                self.updatePass()
                self.scan.statusChanged.get().append(self.scanStatusChanged)
                self.scan.newService.get().append(self.newService)
+               self.servicelist.clear()
                self.state = self.Running
                err = self.scan.start(self.feid, self.flags)
                if err:
@@ -100,3 +99,6 @@ class ServiceScan:
        def newService(self):
                newServiceName = self.scan.getLastServiceName()
                self.servicelist.addItem(newServiceName)
+
+       def destroy(self):
+               pass