mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop always reseting to defaults on remap delete

Browse Source
This commit is contained in:
sonninnos 2023-05-12 10:32:06 +03:00 committed by LibretroAdmin
parent 3b4acbe5fa
commit 9eb083a864
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configuration.c
View File

@ -4339,8 +4339,6 @@ bool config_load_remap(const char *directory_input_remapping,
FILE_PATH_REMAP_EXTENSION,
sizeof(core_path));
input_remapping_set_defaults(false);
/* If a game remap file exists, load it. */
if (has_content && (new_conf = config_file_new_from_path_to_string(game_path)))
{
@ -5522,10 +5520,9 @@ bool input_remapping_load_file(void *data, const char *path)
return false;
if (!string_is_empty(runloop_st->name.remapfile))
{
input_remapping_deinit(false);
input_remapping_set_defaults(false);
}
input_remapping_set_defaults(false);
runloop_st->name.remapfile = strdup(path);
for (i = 0; i < MAX_USERS; i++)

9
menu/cbs/menu_cbs_ok.c
View File

@ -3602,24 +3602,15 @@ static int generic_action_ok_remap_file_operation(const char *path,
{
case ACTION_OK_REMAP_FILE_REMOVE_CORE:
if (flags & RUNLOOP_FLAG_REMAPS_CORE_ACTIVE)
{
input_remapping_deinit(false);
input_remapping_set_defaults(false);
}
break;
case ACTION_OK_REMAP_FILE_REMOVE_GAME:
if (flags & RUNLOOP_FLAG_REMAPS_GAME_ACTIVE)
{
input_remapping_deinit(false);
input_remapping_set_defaults(false);
}
break;
case ACTION_OK_REMAP_FILE_REMOVE_CONTENT_DIR:
if (flags & RUNLOOP_FLAG_REMAPS_CONTENT_DIR_ACTIVE)
{
input_remapping_deinit(false);
input_remapping_set_defaults(false);
}
break;
}