properly update statusbar after network restart
authoracid-burn <acidburn@opendreambox.org>
Wed, 22 Jul 2009 06:41:27 +0000 (08:41 +0200)
committeracid-burn <acidburn@opendreambox.org>
Wed, 22 Jul 2009 06:41:27 +0000 (08:41 +0200)
also ignore wmaster0 interface

lib/python/Components/Network.py
lib/python/Screens/NetworkSetup.py

index 31a9028..f65d609 100755 (executable)
@@ -46,7 +46,7 @@ class Network:
                for line in result:
                        try:
                                device = devicesPattern.search(line).group()
                for line in result:
                        try:
                                device = devicesPattern.search(line).group()
-                               if device == 'wifi0':
+                               if device in ('wifi0', 'wmaster0'):
                                        continue
                                self.getDataForInterface(device, callback)
                        except AttributeError:
                                        continue
                                self.getDataForInterface(device, callback)
                        except AttributeError:
index 50f8c41..db6b5f9 100755 (executable)
@@ -946,6 +946,7 @@ class AdapterSetupConfiguration(Screen, HelpableScreen):
 
        def restartfinishedCB(self,data):
                if data is True:
 
        def restartfinishedCB(self,data):
                if data is True:
+                       self.updateStatusbar()
                        self.session.open(MessageBox, _("Finished restarting your network"), type = MessageBox.TYPE_INFO, timeout = 10, default = False)
 
        def dataAvail(self,data):
                        self.session.open(MessageBox, _("Finished restarting your network"), type = MessageBox.TYPE_INFO, timeout = 10, default = False)
 
        def dataAvail(self,data):