diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index eb1ef8f..f16e13e 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -944,12 +944,12 @@ void *on_config_save(void *data){ main_window *widgets = (main_window*)data; int size=0; - config_str parameters = yon_config_get_selection_by_key(&size, + config_str parameters = yon_config_get_selection_by_key_no_ignored(&size, AUTOINSTALL_TYPE_INSTALL, AUTOINSTALL_DEVICE, device_format_parameter, device_label_parameter, - main_config.install_mode!=1||main_config.install_mode!=2?NULL:part_parameter, + main_config.install_mode!=1&&main_config.install_mode!=2?NULL:part_parameter, part_type_parameter, device_format_parameter, main_config.install_mode!=1?NULL:part_size_parameter, diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 692c455..b79da64 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -76,8 +76,13 @@ NULL #define get_parts_and_devices_command "lsblk --noheadings -Jo TYPE,PATH,SIZE,FSTYPE,LABEL,PARTLABEL,MOUNTPOINT,FSUSED,FSUSE% --exclude 7,253" #define AUTOINSTALL_TYPE_INSTALL "AUTOINSTALL[install_type]" +#define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]" + #define AUTOINSTALL_DEVICE "AUTOINSTALL[device]" +#define AUTOINSTALL_DEVICE_command "ubconfig --source global get [autoinstall] AUTOINSTALL[device]" + #define part_parameter "AUTOINSTALL[part]" +#define part_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part]" #define user_name_parameter "AUTOINSTALL[user_name]" #define user_name_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[user_name]" @@ -121,9 +126,6 @@ NULL #define open_gparted_command "gparted" -#define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]" -#define AUTOINSTALL_DEVICE_command "ubconfig --source global get [autoinstall] AUTOINSTALL[device]" -#define part_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part]" #define PASSWORD_DEFAULT "ublinux"