summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/dmenu.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-03-02 07:31:58 +0000
committerjkh <jkh@FreeBSD.org>1996-03-02 07:31:58 +0000
commitce1a5be6897e107d2762d51c2cb3c49ea6ad3aa7 (patch)
treebe0a959e707248fd0c14448975fefdb7ebc40040 /usr.sbin/sysinstall/dmenu.c
parent27eac390dd8c7d4b30209f36c1d1a84103ed11ca (diff)
downloadFreeBSD-src-ce1a5be6897e107d2762d51c2cb3c49ea6ad3aa7.zip
FreeBSD-src-ce1a5be6897e107d2762d51c2cb3c49ea6ad3aa7.tar.gz
Miscellaneous cleanup before big round of menu restructuring (to use new
libdialog features).
Diffstat (limited to 'usr.sbin/sysinstall/dmenu.c')
-rw-r--r--usr.sbin/sysinstall/dmenu.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index 333f9b5..64f457d 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/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.12.2.5 1995/10/19 15:55:00 jkh Exp $
+ * $Id: dmenu.c,v 1.13 1995/12/07 10:33:44 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -163,13 +163,9 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max)
if (!rval) {
if (menu->options & DMENU_MULTIPLE_TYPE) {
- if (menu->options & DMENU_CALL_FIRST)
- tmp = &(menu->items[0]);
- else {
- if (decode_and_dispatch_multiple(menu, result) || menu->options & DMENU_SELECTION_RETURNS) {
- items_free(nitems, curr, max);
- return TRUE;
- }
+ if (decode_and_dispatch_multiple(menu, result) || menu->options & DMENU_SELECTION_RETURNS) {
+ items_free(nitems, curr, max);
+ return TRUE;
}
}
else {
OpenPOWER on IntegriCloud