ui/ncurses: Disable autoboot if boot list is empty
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>
Mon, 4 Apr 2016 05:14:07 +0000 (15:14 +1000)
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>
Tue, 5 Apr 2016 00:50:23 +0000 (10:50 +1000)
If an empty boot order is saved disable autoboot. However don't set
autoboot_enabled to false by clearing the list, as this will hide the
list when it is likely the user wants to make changes.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
ui/ncurses/nc-config.c

index c0df762f155a236f0736fb577e09f99c7fa9a1e8..66ca7a45a63e35f4dd54dc7ad1307ffd9d5e35f9 100644 (file)
@@ -209,7 +209,7 @@ static int screen_process_form(struct config_screen *screen)
                                              screen->widgets.boot_order_f);
 
        autoboot = widget_select_get_value(screen->widgets.autoboot_f);
-       config->autoboot_enabled = autoboot || (autoboot && n_boot_opts);
+       config->autoboot_enabled = autoboot && n_boot_opts;
 
        config->n_autoboot_opts = n_boot_opts;
        config->autoboot_opts = talloc_array(config, struct autoboot_option,
@@ -629,7 +629,6 @@ static void config_screen_autoboot_none(void *arg)
        struct nc_widget_subset *subset = screen->widgets.boot_order_f;
 
        widget_subset_clear_active(subset);
-       screen->autoboot_enabled = false;
 
        widgetset_unpost(screen->widgetset);
        config_screen_layout_widgets(screen);