CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 18:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent some null pointer dereferences

Browse Source
This commit is contained in:
twinaphex 2016-10-21 20:47:11 +02:00
parent b95ec0d28e
commit 7dcb57f22d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runloop.c
View File

@ -736,12 +736,11 @@ void runloop_poll(event_cmd_state_t *cmd)
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU
static int runloop_iterate_menu(enum menu_action action, unsigned *sleep_ms) static int runloop_iterate_menu(settings_t *settings,
enum menu_action action, unsigned *sleep_ms)
{ {
menu_ctx_iterate_t iter; menu_ctx_iterate_t iter;
settings_t *settings = config_get_ptr(); bool focused = settings->pause_nonactive ? video_driver_is_focused() : true;
bool focused = (settings &&
settings->pause_nonactive) ? video_driver_is_focused() : true;
bool is_idle = runloop_idle; bool is_idle = runloop_idle;
focused = focused && !ui_companion_is_on_foreground(); focused = focused && !ui_companion_is_on_foreground();
@ -1182,7 +1181,8 @@ int runloop_iterate(event_cmd_state_t *cmd, unsigned *sleep_ms)
int ret; int ret;
core_poll(); core_poll();
ret = runloop_iterate_menu((enum menu_action) ret = runloop_iterate_menu(settings,
(enum menu_action)
menu_event(cmd->state[0], cmd->state[2]), menu_event(cmd->state[0], cmd->state[2]),
sleep_ms); sleep_ms);