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

Input Remaps: Fix saving of 'Analog to Digital Type' when configuration overrides are used (#13824)

Browse Source
This commit is contained in:
jdgleaver 2022-04-04 18:08:17 +01:00 committed by GitHub
parent a91b538ba9
commit c687a29d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
retroarch.c
View File

@ -1906,6 +1906,18 @@ bool command_event(enum event_command cmd, void *data)
settings->bools.savestate_auto_save,
runloop_st->current_core_type);
if ( runloop_st->remaps_core_active
|| runloop_st->remaps_content_dir_active
|| runloop_st->remaps_game_active
|| !string_is_empty(runloop_st->name.remapfile)
)
{
input_remapping_deinit(true);
input_remapping_set_defaults(true);
}
else
input_remapping_restore_global_config(true);
#ifdef HAVE_CONFIGFILE
if (runloop_st->overrides_active)
{
@ -1928,18 +1940,6 @@ bool command_event(enum event_command cmd, void *data)
video_driver_restore_cached(settings);
if ( runloop_st->remaps_core_active
|| runloop_st->remaps_content_dir_active
|| runloop_st->remaps_game_active
|| !string_is_empty(runloop_st->name.remapfile)
)
{
input_remapping_deinit(true);
input_remapping_set_defaults(true);
}
else
input_remapping_restore_global_config(true);
if (is_inited && load_dummy_core)
{
#ifdef HAVE_MENU
@ -5408,16 +5408,8 @@ bool retroarch_main_init(int argc, char *argv[])
{
/* Before initialising the dummy core, ensure
* that we:
* - Disable any active config overrides
* - Unload any active input remaps */
#ifdef HAVE_CONFIGFILE
if (runloop_st->overrides_active)
{
/* Reload the original config */
config_unload_override();
runloop_st->overrides_active = false;
}
#endif
* - Unload any active input remaps
* - Disable any active config overrides */
if ( runloop_st->remaps_core_active
|| runloop_st->remaps_content_dir_active
|| runloop_st->remaps_game_active
@ -5430,6 +5422,15 @@ bool retroarch_main_init(int argc, char *argv[])
else
input_remapping_restore_global_config(true);
#ifdef HAVE_CONFIGFILE
if (runloop_st->overrides_active)
{
/* Reload the original config */
config_unload_override();
runloop_st->overrides_active = false;
}
#endif
#ifdef HAVE_DYNAMIC
/* Ensure that currently loaded core is properly
* deinitialised */
@ -6046,18 +6047,6 @@ bool retroarch_main_quit(void)
* save state file may be truncated) */
content_wait_for_save_state_task();
#ifdef HAVE_CONFIGFILE
if (runloop_st->overrides_active)
{
/* Reload the original config */
config_unload_override();
runloop_st->overrides_active = false;
}
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
runloop_st->runtime_shader_preset_path[0] = '\0';
#endif
if ( runloop_st->remaps_core_active
|| runloop_st->remaps_content_dir_active
|| runloop_st->remaps_game_active
@ -6069,6 +6058,18 @@ bool retroarch_main_quit(void)
}
else
input_remapping_restore_global_config(true);
#ifdef HAVE_CONFIGFILE
if (runloop_st->overrides_active)
{
/* Reload the original config */
config_unload_override();
runloop_st->overrides_active = false;
}
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
runloop_st->runtime_shader_preset_path[0] = '\0';
#endif
}
runloop_st->shutdown_initiated = true;