diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-03-07 16:39:32 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-03-07 16:39:32 +0000 |
| commit | 2efff52162ce92f64a808f57d56b11b9d2984bdb (patch) | |
| tree | 1ab0c532a1feedc89ddb58c730db82db608e0ae8 /release/sysinstall/media.c | |
| parent | ea722a7705a4dfdc9bb72c0aeec7f289c6cfc20c (diff) | |
Notes
Diffstat (limited to 'release/sysinstall/media.c')
| -rw-r--r-- | release/sysinstall/media.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 5906ca82343f..3b0f231219f9 100644 --- a/release/sysinstall/media.c +++ b/release/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; } |
