properly update statusbar after network restart

also ignore wmaster0 interface

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 31a90282c3d1e35279850ced51625eeae7c717a8..f65d6090c3c8e699d901ab6778cd0ad97f2ee8a4 100755 (executable)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -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:

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 50f8c41b182db5616d97d810ec8bd609fe0bc169..db6b5f9c40e6a0771a9d7769007279c0e7f85e88 100755 (executable)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -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):