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