Cleanup command_event_save_current_config

This commit is contained in:
twinaphex 2016-09-17 00:28:47 +02:00
parent 4caee1ca5f
commit fb8237f1bb
1 changed files with 9 additions and 15 deletions

View File

@ -1589,16 +1589,17 @@ static bool command_event_save_core_config(void)
**/ **/
void command_event_save_current_config(int override_type) void command_event_save_current_config(int override_type)
{ {
settings_t *settings = config_get_ptr(); char msg[128] = {0};
global_t *global = global_get_ptr();
if (!override_type) if (!override_type)
{ {
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
if (settings->config_save_on_exit && !string_is_empty(global->path.config)) if ( settings->config_save_on_exit
&& !string_is_empty(global->path.config))
{ {
bool ret = false; bool ret = false;
char msg[128] = {0};
const char *config_path = config_get_active_path(); const char *config_path = config_get_active_path();
/* Save last core-specific config to the default config location, /* Save last core-specific config to the default config location,
@ -1624,18 +1625,11 @@ void command_event_save_current_config(int override_type)
global->path.config); global->path.config);
RARCH_ERR("%s\n", msg); RARCH_ERR("%s\n", msg);
} }
runloop_msg_queue_push(msg, 1, 180, true);
} }
} }
else else
{ {
bool ret = false; if (config_save_overrides(override_type))
char msg[128] = {0};
ret = config_save_overrides(override_type);
if (ret)
{ {
snprintf(msg, sizeof(msg), "Overrides saved successfully"); snprintf(msg, sizeof(msg), "Overrides saved successfully");
RARCH_LOG("[overrides] %s\n", msg); RARCH_LOG("[overrides] %s\n", msg);
@ -1649,10 +1643,10 @@ void command_event_save_current_config(int override_type)
snprintf(msg, sizeof(msg), "Error saving overrides"); snprintf(msg, sizeof(msg), "Error saving overrides");
RARCH_ERR("[overrides] %s\n", msg); RARCH_ERR("[overrides] %s\n", msg);
} }
runloop_msg_queue_push(msg, 1, 180, true);
return;
} }
if (!string_is_empty(msg))
runloop_msg_queue_push(msg, 1, 180, true);
} }
/** /**