From a639feb96fd91e9979214edf842179b538cf8335 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 2 Jun 2015 11:24:54 +0200 Subject: [PATCH] Use setting_set_with_string_representation in reset_setting function --- settings.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/settings.c b/settings.c index 5029e7aabb..7e8db4079e 100644 --- a/settings.c +++ b/settings.c @@ -65,7 +65,7 @@ void setting_reset_setting(rarch_setting_t* setting) *setting->value.fraction = setting->default_value.fraction; break; case ST_BIND: - *setting->value.keybind = *setting->default_value.keybind; + setting_set_with_string_representation(setting, setting->default_value.keybind); break; case ST_STRING: case ST_PATH: @@ -73,8 +73,7 @@ void setting_reset_setting(rarch_setting_t* setting) if (setting->default_value.string) { if (setting->type == ST_STRING) - strlcpy(setting->value.string, setting->default_value.string, - setting->size); + setting_set_with_string_representation(setting, setting->default_value.string); else fill_pathname_expand_special(setting->value.string, setting->default_value.string, setting->size); @@ -201,8 +200,7 @@ void setting_set_with_string_representation(rarch_setting_t* setting, case ST_DIR: case ST_STRING: case ST_ACTION: - strlcpy(setting->value.string, value, setting->size); - break; + case ST_BIND: case ST_BOOL: if (!strcmp(value, "true")) *setting->value.boolean = true; @@ -223,8 +221,6 @@ void setting_set_with_string_representation(rarch_setting_t* setting, break; case ST_NONE: break; - case ST_BIND: - break; } if (setting->change_handler)