start scan on execBegin to fix missing self.scan when window was non-execing

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

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 575c03028f21a94a1c48ed59a0a652a051da1452..93af4e6239a4b8a4d4589a4edc39dc74834b0f96 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -56,8 +56,6 @@ class ServiceScan:
                self.scanList = scanList
                self.run = 0
                
-               self.doRun()
-               
        def doRun(self):
                self.scan = eComponentScan()
                
@@ -72,12 +70,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 +100,6 @@ class ServiceScan:
        def newService(self):
                newServiceName = self.scan.getLastServiceName()
                self.servicelist.addItem(newServiceName)
+
+       def destroy(self):
+               pass