mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rarch_main_set_state - prevent more null pointer dereferences

Browse Source
This commit is contained in:
twinaphex 2015-03-29 19:03:46 +02:00
parent 9a8a20e85a
commit 31a5c4a1bf
1 changed files with 10 additions and 5 deletions

15
retroarch.c

@ -2073,11 +2073,14 @@ void rarch_main_set_state(unsigned cmd)
/* Override keyboard callback to redirect to menu instead. /* Override keyboard callback to redirect to menu instead.
* We'll use this later for something ... * We'll use this later for something ...
* FIXME: This should probably be moved to menu_common somehow. */ * FIXME: This should probably be moved to menu_common somehow. */
global->frontend_key_event = global->system.key_event; if (global)
global->system.key_event = menu_input_key_event; {
global->frontend_key_event = global->system.key_event;
global->system.key_event = menu_input_key_event;
global->system.frame_time_last = 0;
}
menu->need_refresh = true; menu->need_refresh = true;
global->system.frame_time_last = 0;
runloop->is_menu = true; runloop->is_menu = true;
} }
#endif #endif
@ -2108,7 +2111,8 @@ void rarch_main_set_state(unsigned cmd)
driver->flushing_input = true; driver->flushing_input = true;
/* Restore libretro keyboard callback. */ /* Restore libretro keyboard callback. */
global->system.key_event = global->frontend_key_event; if (global)
global->system.key_event = global->frontend_key_event;
#endif #endif
video_driver_set_texture_enable(false, false); video_driver_set_texture_enable(false, false);
break; break;
@ -2118,7 +2122,8 @@ void rarch_main_set_state(unsigned cmd)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
break; break;
case RARCH_ACTION_STATE_FORCE_QUIT: case RARCH_ACTION_STATE_FORCE_QUIT:
global->lifecycle_state = 0; if (global)
global->lifecycle_state = 0;
rarch_main_set_state(RARCH_ACTION_STATE_QUIT); rarch_main_set_state(RARCH_ACTION_STATE_QUIT);
break; break;
case RARCH_ACTION_STATE_NONE: case RARCH_ACTION_STATE_NONE: