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

Merge pull request #11839 from IAmBoring/boring1 

Core run init failure forces return to menu
This commit is contained in:
Autechre 2021-01-07 09:21:33 +01:00 committed by GitHub
parent cada1f6ff0 510bed6655
commit d935b392d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroarch.c
View File

@ -34538,7 +34538,7 @@ bool retroarch_main_init(int argc, char *argv[])
{ {
RARCH_ERR("%s: \"%s\"\n", RARCH_ERR("%s: \"%s\"\n",
msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN), p_rarch->error_string); msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN), p_rarch->error_string);
return false; goto error;
} }
p_rarch->rarch_error_on_init = true; p_rarch->rarch_error_on_init = true;
@ -36801,7 +36801,15 @@ static enum runloop_state runloop_check_state(
} }
if (!menu_driver_iterate(&iter, current_time)) if (!menu_driver_iterate(&iter, current_time))
retroarch_menu_running_finished(false); {
if (p_rarch->rarch_error_on_init)
{
content_ctx_info_t content_info = {0};
task_push_start_dummy_core(&content_info);
}
else
retroarch_menu_running_finished(false);
}
if (focused || !p_rarch->runloop_idle) if (focused || !p_rarch->runloop_idle)
{ {