Fixed restored config loading of previous config instead of current

pull/396/head
parent f31d3a69d6
commit 4bf42b0722

@ -5366,4 +5366,7 @@ msgid "The required field is highlighted in green"
msgstr ""
msgid "Authentication in the bootloader menu"
msgstr ""
msgid "Exit"
msgstr ""

@ -5561,4 +5561,7 @@ msgid "The required field is highlighted in green"
msgstr "Обязательное поле подсвечено зелёным"
msgid "Authentication in the bootloader menu"
msgstr "Аутентификация в меню загрузчика"
msgstr "Аутентификация в меню загрузчика"
msgid "Exit"
msgstr "Выход"

@ -13,7 +13,6 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
yon_config_custom_clean(main_config.startup_config);
}
main_config.startup_config = NULL;
yon_config_custom_load_config(&main_config.startup_config,config_get_command(main_config.config_load_path),NULL);
}
}
if (!yon_char_is_empty(config_get_default_command)){
@ -23,6 +22,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
case YON_CONFIG_LOCAL:
main_config.config_load_path = yon_char_new("system");
main_config.config_save_path = main_config.config_load_path;
yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL);
yon_config_load_config(type,config_get_command("system"),NULL);
break;
case YON_CONFIG_CUSTOM:
@ -36,16 +36,17 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
yon_config_custom_clean(main_config.startup_config);
}
main_config.startup_config = NULL;
yon_config_custom_load_config(&main_config.startup_config,config_get_command(main_config.config_load_path),NULL);
}
main_config.config_load_path = yon_char_new(path);
main_config.config_save_path = main_config.config_load_path;
yon_config_clean();
yon_config_load_config(type,config_get_command(path),NULL);
yon_config_custom_load_config(&main_config.startup_config,config_get_command(path),NULL);
}
} else {
yon_config_clean();
yon_config_load_config(type,config_get_command(main_config.force_ini),NULL);
yon_config_custom_load_config(&main_config.startup_config,config_get_command(main_config.force_ini),NULL);
}
break;
default:

@ -207,6 +207,7 @@ NULL)
#define CONFIGURATION_MODE_TITLE_LABEL _("Choose installation configuration file")
#define SAVE_AND_EXIT_LABEL _("Save and exit")
#define EXIT_LABEL yon_char_get_localised_from_lib("Exit")
#define NO_LABEL _("No")
#define PARITY_INVALID_LABEL(target) yon_char_unite(_("Invalid devices parity. Needed:")," ",target,NULL)

Loading…
Cancel
Save