ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move SRAM init to content init (#14653)

This commit is contained in:
sonninnos 2022-11-21 16:24:58 +02:00 committed by GitHub
parent 6a098d37ac
commit 10a74657c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intl/msg_hash_us.h
View File

@ -12118,10 +12118,6 @@ MSG_HASH(
MSG_AUTO_SAVE_STATE_TO, MSG_AUTO_SAVE_STATE_TO,
"Auto save state to" "Auto save state to"
) )
MSG_HASH(
MSG_BLOCKING_SRAM_OVERWRITE,
"Blocking SRAM Overwrite"
)
MSG_HASH( MSG_HASH(
MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT, MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
"Bringing up command interface on port" "Bringing up command interface on port"
@ -12814,10 +12810,6 @@ MSG_HASH(
MSG_SHADER_PRESET_SAVED_SUCCESSFULLY, MSG_SHADER_PRESET_SAVED_SUCCESSFULLY,
"Shader preset saved successfully." "Shader preset saved successfully."
) )
MSG_HASH(
MSG_SKIPPING_SRAM_LOAD,
"Skipping SRAM load."
)
MSG_HASH( MSG_HASH(
MSG_SLOW_MOTION, MSG_SLOW_MOTION,
"Slow-Motion." "Slow-Motion."
@ -12830,10 +12822,18 @@ MSG_HASH(
MSG_SLOW_MOTION_REWIND, MSG_SLOW_MOTION_REWIND,
"Slow-motion rewind." "Slow-motion rewind."
) )
MSG_HASH(
MSG_SKIPPING_SRAM_LOAD,
"Skipping SRAM load."
)
MSG_HASH( MSG_HASH(
MSG_SRAM_WILL_NOT_BE_SAVED, MSG_SRAM_WILL_NOT_BE_SAVED,
"SRAM will not be saved." "SRAM will not be saved."
) )
MSG_HASH(
MSG_BLOCKING_SRAM_OVERWRITE,
"Blocking SRAM Overwrite"
)
MSG_HASH( MSG_HASH(
MSG_STARTING_MOVIE_PLAYBACK, MSG_STARTING_MOVIE_PLAYBACK,
"Starting movie playback." "Starting movie playback."

2
retroarch.c
View File

@ -5528,8 +5528,6 @@ bool retroarch_main_init(int argc, char *argv[])
if (!string_is_empty(recording_st->path)) if (!string_is_empty(recording_st->path))
command_event(CMD_EVENT_RECORD_INIT, NULL); command_event(CMD_EVENT_RECORD_INIT, NULL);
runloop_path_init_savefile();
command_event(CMD_EVENT_SET_PER_GAME_RESOLUTION, NULL); command_event(CMD_EVENT_SET_PER_GAME_RESOLUTION, NULL);
global->error_on_init = false; global->error_on_init = false;

2
runloop.c
View File

@ -5200,6 +5200,8 @@ static bool event_init_content(
command_event_set_savestate_auto_index(settings); command_event_set_savestate_auto_index(settings);
runloop_path_init_savefile();
if (!event_load_save_files(runloop_st->flags & if (!event_load_save_files(runloop_st->flags &
RUNLOOP_FLAG_IS_SRAM_LOAD_DISABLED)) RUNLOOP_FLAG_IS_SRAM_LOAD_DISABLED))
RARCH_LOG("[SRAM]: %s\n", RARCH_LOG("[SRAM]: %s\n",

5
tasks/task_content.c
View File

@ -3098,13 +3098,10 @@ bool content_init(void)
if (error_string) if (error_string)
{ {
if (ret) if (ret)
{
RARCH_LOG("[Content]: %s\n", error_string); RARCH_LOG("[Content]: %s\n", error_string);
}
else else
{
RARCH_ERR("[Content]: %s\n", error_string); RARCH_ERR("[Content]: %s\n", error_string);
}
/* Do not flush the message queue here /* Do not flush the message queue here
* > This allows any core-generated error messages * > This allows any core-generated error messages
* to propagate through to the frontend */ * to propagate through to the frontend */