diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-04-25 17:31:27 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-04-25 17:31:27 +0000 |
| commit | 18b1c03d52e72575e3c72a3da08c7445257eee5d (patch) | |
| tree | eed63e3f1a52745b1f4775b9da1bfc44ade22ebb /release/sysinstall/dmenu.c | |
| parent | 7af0a5dbaf0ac5150798accd11471ea4da962b23 (diff) | |
Notes
Diffstat (limited to 'release/sysinstall/dmenu.c')
| -rw-r--r-- | release/sysinstall/dmenu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c index 8081dd76a7b0..7880770be567 100644 --- a/release/sysinstall/dmenu.c +++ b/release/sysinstall/dmenu.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: dmenu.c,v 1.16 1996/04/13 13:31:31 jkh Exp $ + * $Id: dmenu.c,v 1.17 1996/04/23 01:29:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -51,10 +51,8 @@ dmenuDisplayFile(dialogMenuItem *tmp) int dmenuSubmenu(dialogMenuItem *tmp) { - int i; - - i = dmenuOpenSimple((DMenu *)tmp->data) ? DITEM_SUCCESS : DITEM_FAILURE; - return i | DITEM_RESTORE; + return (dmenuOpenSimple((DMenu *)(tmp->data)) ? DITEM_SUCCESS : DITEM_FAILURE) | + DITEM_RESTORE | DITEM_RECREATE; } int @@ -201,10 +199,10 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max) menu_height(menu, n), -n, menu->items, NULL); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); - + clearok(stdscr, TRUE); if (rval) return FALSE; - else if (cancelled || (menu->type & (DMENU_SELECTION_RETURNS | DMENU_RADIO_TYPE | DMENU_CHECKLIST_TYPE))) { + else if (cancelled || menu->type & DMENU_SELECTION_RETURNS) { cancelled = FALSE; return TRUE; } |