From 99fe70a189f079068425af3116cc0315c314ca8a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 21 Jan 2016 03:46:43 +0100 Subject: [PATCH] Fix crash in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK --- dynamic.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dynamic.c b/dynamic.c index ba901051cf..f7ac3d7bea 100644 --- a/dynamic.c +++ b/dynamic.c @@ -856,12 +856,11 @@ bool rarch_environment_cb(unsigned cmd, void *data) runloop_ctl(RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event); runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET, &key_event); - if (!key_event) - return false; - RARCH_LOG("Environ SET_KEYBOARD_CALLBACK.\n"); - *key_event = info->callback; - *frontend_key_event = *key_event; + if (key_event) + *key_event = info->callback; + if (frontend_key_event) + *frontend_key_event = *key_event; break; }