Finally DTRT with tcpOpenDialog(); it should have never diddled

mediaDevice directly.

1 files changed, 12 insertions, 17 deletions

diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 8362b7b..09e272f 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -335,18 +335,16 @@ mediaSetFTP(dialogMenuItem *self)
 				"would you like to skip over it now?") != 0) {
 	if (networkDev)
 	    networkDev->shutdown(networkDev);
-	networkDev = NULL;
-	if (!tcpDeviceSelect()) {
+	if (!(networkDev = tcpDeviceSelect())) {
 	    variable_unset(VAR_FTP_PATH);
 	    return DITEM_FAILURE | what;
 	}
-	if (!mediaDevice || !mediaDevice->init(mediaDevice)) {
-	    if (isDebug())
-		msgDebug("mediaSetFTP: Net device init failed.\n");
-	    variable_unset(VAR_FTP_PATH);
-	    return DITEM_FAILURE | what;
-	}
-	networkDev = mediaDevice;
+    }
+    if (!networkDev->init(networkDev)) {
+	if (isDebug())
+	    msgDebug("mediaSetFTP: Net device init failed.\n");
+	variable_unset(VAR_FTP_PATH);
+	return DITEM_FAILURE | what;
     }
     hostname = cp + 6;
     if ((cp = index(hostname, ':')) != NULL) {
@@ -448,15 +446,12 @@ mediaSetNFS(dialogMenuItem *self)
 				"would you like to skip over it now?") != 0) {
 	if (networkDev)
 	    networkDev->shutdown(networkDev);
-	networkDev = NULL;
-	if (!tcpDeviceSelect())
-	    return DITEM_FAILURE;
-	if (!mediaDevice || !mediaDevice->init(mediaDevice)) {
-	    if (isDebug())
-		msgDebug("mediaSetNFS: Net device init failed\n");
+	if (!(networkDev = tcpDeviceSelect()))
 	    return DITEM_FAILURE;
-	}
-	networkDev = mediaDevice;
+    }
+    if (!networkDev->init(networkDev)) {
+	if (isDebug())
+	    msgDebug("mediaSetNFS: Net device init failed\n");
     }
     if (variable_get(VAR_NAMESERVER)) {
 	if ((gethostbyname(cp) == NULL) && (inet_addr(cp) == INADDR_NONE)) {