diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-17 13:03:23 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-17 13:03:23 +0100 |
| commit | f5f419866f81d7c356c633acdb39c9da91c3377c (patch) | |
| tree | 614ec10d29c405775b9f78e63269077a83facc11 /lib/python | |
| parent | ef7d9da53faae798abe9d04c736cc269015aaa52 (diff) | |
| parent | f389b2688c769776b706f2fec59c3bcc1425cbc0 (diff) | |
| download | enigma2-f5f419866f81d7c356c633acdb39c9da91c3377c.tar.gz enigma2-f5f419866f81d7c356c633acdb39c9da91c3377c.zip | |
Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Screens/NetworkSetup.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index b32ebaf6..3e9354ea 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: |