EMU/libretro_RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2026-01-09 06:34:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime log state slot saving with override unloading

Browse Source
This commit is contained in:
sonninnos 2026-01-04 21:32:47 +02:00
parent f754e91a22
commit a8dc7056de
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
retroarch.c
View File

@ -8082,18 +8082,19 @@ bool retroarch_main_init(int argc, char *argv[])
else else
input_remapping_restore_global_config(true, false); input_remapping_restore_global_config(true, false);
#ifdef HAVE_CONFIGFILE
/* Reload the original config */
if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE)
config_unload_override();
#endif
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
/* Ensure that currently loaded core is properly /* Ensure that currently loaded core is properly
* deinitialised */ * deinitialised */
if (runloop_st->current_core_type != CORE_TYPE_DUMMY) if (runloop_st->current_core_type != CORE_TYPE_DUMMY)
command_event(CMD_EVENT_CORE_DEINIT, NULL); command_event(CMD_EVENT_CORE_DEINIT, NULL);
#endif #endif
#ifdef HAVE_CONFIGFILE
/* Reload the original config */
if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE)
config_unload_override();
#endif
/* Attempt initializing dummy core */ /* Attempt initializing dummy core */
runloop_st->current_core_type = CORE_TYPE_DUMMY; runloop_st->current_core_type = CORE_TYPE_DUMMY;
if (!command_event(CMD_EVENT_CORE_INIT, &runloop_st->current_core_type)) if (!command_event(CMD_EVENT_CORE_INIT, &runloop_st->current_core_type))
@ -8681,6 +8682,12 @@ bool retroarch_main_quit(void)
* save state file may be truncated) */ * save state file may be truncated) */
content_wait_for_save_state_task(); content_wait_for_save_state_task();
runloop_runtime_log_deinit(runloop_st,
settings->bools.content_runtime_log,
settings->bools.content_runtime_log_aggregate,
settings->paths.directory_runtime_log,
settings->paths.directory_playlist);
if ( (runloop_st->flags & RUNLOOP_FLAG_REMAPS_CORE_ACTIVE) if ( (runloop_st->flags & RUNLOOP_FLAG_REMAPS_CORE_ACTIVE)
|| (runloop_st->flags & RUNLOOP_FLAG_REMAPS_CONTENT_DIR_ACTIVE) || (runloop_st->flags & RUNLOOP_FLAG_REMAPS_CONTENT_DIR_ACTIVE)
|| (runloop_st->flags & RUNLOOP_FLAG_REMAPS_GAME_ACTIVE) || (runloop_st->flags & RUNLOOP_FLAG_REMAPS_GAME_ACTIVE)
@ -8694,11 +8701,9 @@ bool retroarch_main_quit(void)
input_remapping_restore_global_config(true, false); input_remapping_restore_global_config(true, false);
#ifdef HAVE_CONFIGFILE #ifdef HAVE_CONFIGFILE
/* Reload the original config */
if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE) if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE)
{
/* Reload the original config */
config_unload_override(); config_unload_override();
}
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU

5
runloop.c
View File

@ -660,7 +660,6 @@ static void runloop_update_runtime_log(
free(runtime_log); free(runtime_log);
} }
void runloop_runtime_log_deinit( void runloop_runtime_log_deinit(
runloop_state_t *runloop_st, runloop_state_t *runloop_st,
bool content_runtime_log, bool content_runtime_log,
@ -4125,11 +4124,9 @@ void runloop_event_deinit_core(void)
driver_uninit(DRIVERS_CMD_ALL, (enum driver_lifetime_flags)0); driver_uninit(DRIVERS_CMD_ALL, (enum driver_lifetime_flags)0);
#ifdef HAVE_CONFIGFILE #ifdef HAVE_CONFIGFILE
/* Reload the original config */
if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE) if (runloop_st->flags & RUNLOOP_FLAG_OVERRIDES_ACTIVE)
{
/* Reload the original config */
config_unload_override(); config_unload_override();
}
#endif #endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
runloop_st->runtime_shader_preset_path[0] = '\0'; runloop_st->runtime_shader_preset_path[0] = '\0';