libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-19 06:33:56 +02:00
parent 7b9cef731d
commit 7f9168ff18
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
retroarch.c
View File

@ -1272,8 +1272,8 @@ static void retroarch_validate_cpu_features(void)
**/ **/
bool retroarch_main_init(int argc, char *argv[]) bool retroarch_main_init(int argc, char *argv[])
{ {
bool menu_alive; bool init_failed = false;
bool init_failed; bool menu_alive = false;
retroarch_init_state(); retroarch_init_state();
@ -1356,7 +1356,6 @@ bool retroarch_main_init(int argc, char *argv[])
#endif #endif
/* Attempt to initialize core */ /* Attempt to initialize core */
init_failed = false;
if (current_core_explicitly_set) if (current_core_explicitly_set)
{ {
current_core_explicitly_set = false; current_core_explicitly_set = false;
@ -1367,15 +1366,19 @@ bool retroarch_main_init(int argc, char *argv[])
init_failed = true; init_failed = true;
/* Handle core initialization failure */ /* Handle core initialization failure */
if (init_failed) { if (init_failed)
{
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Check if menu was active prior to core initialization */ /* Check if menu was active prior to core initialization */
if (menu_alive) { if (menu_alive)
{
/* Attemot initializing dummy core */ /* Attemot initializing dummy core */
current_core_type = CORE_TYPE_DUMMY; current_core_type = CORE_TYPE_DUMMY;
if (!command_event(CMD_EVENT_CORE_INIT, &current_core_type)) if (!command_event(CMD_EVENT_CORE_INIT, &current_core_type))
goto error; goto error;
} else { }
else
{
/* Fall back to regular error handling */ /* Fall back to regular error handling */
goto error; goto error;
} }