From baaccf08623b8fb1bb23f2251efc79d5047ef79a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 5 Jun 2003 03:32:08 +0000 Subject: fix popWindow() to be in the right place throughout --- textw/network_text.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'textw') diff --git a/textw/network_text.py b/textw/network_text.py index 022d69e60..f51625cd3 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -115,9 +115,9 @@ class NetworkDeviceWindow: while 1: result = toplevel.run() rc = bb.buttonPressed (result) - screen.popWindow() if rc == TEXT_BACK_CHECK: + screen.popWindow() return INSTALL_BACK if self.onbootCb.selected() != 0: @@ -155,6 +155,7 @@ class NetworkDeviceWindow: break + screen.popWindow() return INSTALL_OK @@ -249,9 +250,9 @@ class NetworkGlobalWindow: while 1: result = toplevel.run() rc = bb.buttonPressed (result) - screen.popWindow() if rc == TEXT_BACK_CHECK: + screen.popWindow() return INSTALL_BACK val = gwEntry.value() @@ -278,7 +279,8 @@ class NetworkGlobalWindow: continue network.ternaryNS = val break - + + screen.popWindow() return INSTALL_OK @@ -349,9 +351,9 @@ class HostnameWindow: while 1: result = toplevel.run() rc = bb.buttonPressed(result) - screen.popWindow() if rc == TEXT_BACK_CHECK: + screen.popWindow() return INSTALL_BACK if radio.getSelection() != "manual": @@ -377,6 +379,7 @@ class HostnameWindow: network.hostname = hname break + screen.popWindow() return INSTALL_OK -- cgit