]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[menu] Fix default selection when default is item 0
authorMichael Brown <mcb30@ipxe.org>
Fri, 30 Mar 2012 16:57:52 +0000 (17:57 +0100)
committerMichael Brown <mcb30@ipxe.org>
Fri, 30 Mar 2012 16:57:52 +0000 (17:57 +0100)
Reported-by: Robin Smidsrød <robin@smidsrod.no>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
src/hci/tui/menu_ui.c

index 6b1b63235b9a61ef90edf145b0a90c205682faef..2457a82543bc5821d565e65e6aec540c11961f48 100644 (file)
@@ -315,9 +315,9 @@ int show_menu ( struct menu *menu, unsigned int timeout_ms,
        ui.timeout = ( ( timeout_ms * TICKS_PER_SEC ) / 1000 );
        list_for_each_entry ( item, &menu->items, list ) {
                if ( item->label ) {
-                       labelled_count++;
-                       if ( ! ui.selected )
+                       if ( ! labelled_count )
                                ui.selected = ui.count;
+                       labelled_count++;
                        if ( item->is_default )
                                ui.selected = ui.count;
                }