From: acid-burn Date: Thu, 17 Dec 2009 11:55:19 +0000 (+0100) Subject: Screens/NetworkSetup.py: - dont count current interface as second interface if only... X-Git-Tag: 2.7.0~32^2~2^2 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f389b2688c769776b706f2fec59c3bcc1425cbc0 Screens/NetworkSetup.py: - dont count current interface as second interface if only one interface is currently configured --- diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index c24fddeb..9461242d 100755 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -551,7 +551,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen): if (ret == True): num_configured_if = len(iNetwork.getConfiguredAdapters()) if num_configured_if >= 1: - self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("A second configured interface has been found.\n\nDo you want to disable the second network interface?"), default = True) + if num_configured_if == 1 and self.iface in iNetwork.getConfiguredAdapters(): + self.applyConfig(True) + else: + self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("A second configured interface has been found.\n\nDo you want to disable the second network interface?"), default = True) else: self.applyConfig(True) else: