diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index 21832a6..77c8e17 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -429,19 +429,20 @@ int yon_config_save(main_window *widgets){ return 1; } -void yon_config_restore(main_window *widgets){ - switch(main_config.load_mode){ - case YON_CONFIG_GLOBAL: - on_config_global_load(NULL,widgets); - break; - case YON_CONFIG_LOCAL: - on_config_local_load(NULL,widgets); - break; - case YON_CONFIG_CUSTOM: - on_config_custom_load_last(NULL,widgets); +void yon_config_restore(main_window *){ + yon_load_proceed(main_config.load_mode); + // switch(main_config.load_mode){ + // case YON_CONFIG_GLOBAL: + // on_config_global_load(NULL,widgets); + // break; + // case YON_CONFIG_LOCAL: + // on_config_local_load(NULL,widgets); + // break; + // case YON_CONFIG_CUSTOM: + // on_config_custom_load_last(NULL,widgets); - } - on_config_global_load(NULL,widgets); + // } + // on_config_global_load(NULL,widgets); yon_launch("ubconfig --source system remove [autoinstall]"); - yon_config_save_simple(YON_CONFIG_LOCAL,"system"); + // yon_config_save_simple(YON_CONFIG_LOCAL,"system"); } \ No newline at end of file diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 4315069..934b9d1 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -261,7 +261,7 @@ layout && /description:/ {\ #define SYSTEM_LANG_parameter "AUTOINSTALL['ubconfig set [locale] LANG']" #define SYSTEM_LANG_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [locale] LANG']" -#define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" +#define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG" #define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ", parameters, "; nice ubinstall2 --debug autoinstall", NULL)