dont start self.console twice

[enigma2.git] / lib / python / Screens / NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 6bfe54ad6406c7103c273c09ac3d130ff38c1cc1..5cb4d3903fda5db774a386aabe26c7c8220dbd0e 100755 (executable)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -174,6 +174,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
        def cleanup(self):
                iNetwork.stopLinkStateConsole()
                iNetwork.stopRestartConsole()
+               iNetwork.stopGetInterfacesConsole()
 
        def restartLan(self):
                iNetwork.restartNetwork(self.restartLanDataAvail)
@@ -219,6 +220,10 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
                        "yellow": (self.remove, _("remove a nameserver entry")),
                        })
                
+               self["actions"] = NumberActionMap(["SetupActions"],
+               {
+                       "ok": self.ok,
+               }, -2)          
                
                self.list = []
                ConfigListScreen.__init__(self, self.list)
@@ -421,10 +426,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                                                        if a['active']:
                                                                if a['essid'] == "":
                                                                        a['essid'] = a['bssid']
-                                                               self.nwlist.append( a['essid'])
+                                                               self.nwlist.append((a['essid'],a['essid']))
                                        self.nwlist.sort(key = lambda x: x[0])
                                except:
-                                       self.nwlist.append("No Networks found")
+                                       self.nwlist.append(("No Networks found",_("No Networks found")))
 
                        self.wsconfig = self.ws.loadConfig()
                        if self.essid is not None: # ssid from wlan scan
@@ -433,10 +438,9 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen):
                                self.default = self.wsconfig['ssid']
                                
                        if "hidden..." not in self.nwlist:
-                               self.nwlist.append("hidden...")
+                               self.nwlist.append(("hidden...",_("hidden network")))
                        if self.default not in self.nwlist:
-                               self.nwlist.append(self.default)
-
+                               self.nwlist.append((self.default,self.default))
                        config.plugins.wlan.essid = NoSave(ConfigSelection(self.nwlist, default = self.default ))
                        config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = self.wsconfig['hiddenessid'], visible_width = 50, fixed_size = False))