From fb9a08eec21dc6fd5697d2cb9eabeb95a937dab0 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 7 Mar 1997 16:39:32 +0000
Subject: YAMF22

---
 usr.sbin/sysinstall/media.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'usr.sbin/sysinstall/media.c')

diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 5906ca8..3b0f231 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id$
+ * $Id: media.c,v 1.80 1997/02/22 14:11:57 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -675,21 +675,15 @@ mediaExtractDist(char *dir, char *dist, FILE *fp)
 int
 mediaGetType(dialogMenuItem *self)
 {
-    int i;
-
-    i = dmenuOpenSimple(&MenuMedia, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
-    return i | DITEM_RESTORE;
+    return ((dmenuOpenSimple(&MenuMedia, FALSE) && mediaDevice) ? DITEM_SUCCESS : DITEM_FAILURE) | DITEM_RESTORE;
 }
 
 /* Return TRUE if all the media variables are set up correctly */
 Boolean
 mediaVerify(void)
 {
-    if (!mediaDevice) {
-	msgConfirm("Media type not set!  Please select a media type\n"
-		   "from the Installation menu before proceeding.");
-	return DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS;
-    }
+    if (!mediaDevice)
+	return (DITEM_STATUS(mediaGetType(NULL)) == DITEM_SUCCESS);
     return TRUE;
 }
 
-- 
cgit v1.1