mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-10 12:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use setting_set_with_string_representation in reset_setting function"

Browse Source 
This reverts commit a639feb96fd91e9979214edf842179b538cf8335.
This commit is contained in:
twinaphex 2015-06-02 11:30:11 +02:00
parent a639feb96f
commit ca218ee56d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings.c
View File

@ -65,7 +65,7 @@ void setting_reset_setting(rarch_setting_t* setting)
*setting->value.fraction = setting->default_value.fraction; *setting->value.fraction = setting->default_value.fraction;
break; break;
case ST_BIND: case ST_BIND:
setting_set_with_string_representation(setting, setting->default_value.keybind); *setting->value.keybind = *setting->default_value.keybind;
break; break;
case ST_STRING: case ST_STRING:
case ST_PATH: case ST_PATH:
@ -73,7 +73,8 @@ void setting_reset_setting(rarch_setting_t* setting)
if (setting->default_value.string) if (setting->default_value.string)
{ {
if (setting->type == ST_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 else
fill_pathname_expand_special(setting->value.string, fill_pathname_expand_special(setting->value.string,
setting->default_value.string, setting->size); 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_DIR:
case ST_STRING: case ST_STRING:
case ST_ACTION: case ST_ACTION:
case ST_BIND: strlcpy(setting->value.string, value, setting->size);
break;
case ST_BOOL: case ST_BOOL:
if (!strcmp(value, "true")) if (!strcmp(value, "true"))
*setting->value.boolean = true; *setting->value.boolean = true;
@ -221,6 +223,8 @@ void setting_set_with_string_representation(rarch_setting_t* setting,
break; break;
case ST_NONE: case ST_NONE:
break; break;
case ST_BIND:
break;
} }
if (setting->change_handler) if (setting->change_handler)