diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 36fc64a..84645ae 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -31,9 +31,9 @@ void on_save_done(main_window *, config_str output, int size){ void yon_load_proceed(YON_CONFIG_TYPE type){ if (type!=YON_CONFIG_CUSTOM){ yon_config_clean(); + if (!yon_char_is_empty(config_get_default_command)) + yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); } - if (!yon_char_is_empty(config_get_default_command)) - yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); if (type==YON_CONFIG_GLOBAL){ yon_config_load_config(type,config_get_global_command,NULL); } else if (type==YON_CONFIG_LOCAL){ @@ -57,6 +57,8 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ path=file; } yon_config_clean(); + if (!yon_char_is_empty(config_get_default_command)) + yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); char *command = yon_config_get_custom_command(path); yon_config_load_config(type,command,NULL); gtk_widget_destroy(dialog); diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h index cba57b9..940ecb9 100644 --- a/source/ubl-settings-services.h +++ b/source/ubl-settings-services.h @@ -126,9 +126,9 @@ #define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK",NULL) #define config_get_local_command "ubconfig --source system get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK" #define config_get_global_command yon_char_new("ubconfig --source global get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK") -#define config_get_default_command "" +#define config_get_default_command "ubconfig --source default get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK" -#define config_get_global_only_parameters "ubconfig --source default get system SERVICES_ENABLE SERVICES_DISABLE SERVICES_MASK" +#define config_get_global_only_parameters "" #define config_get_local_only_parameters "" #define SERVICES_ENABLE_get_command "ubconfig --source global get [system] SERVICES_ENABLE"