From 2c3cb61ca816bce3184befe87590a3a81223b59d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Jan 2016 08:40:18 +0100 Subject: [PATCH] Move code to libretro_version_1.c --- command_event.c | 2 -- libretro_version_1.c | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/command_event.c b/command_event.c index d85543bb89..df45983a20 100644 --- a/command_event.c +++ b/command_event.c @@ -601,8 +601,6 @@ static bool event_init_core(void) if (!event_init_content()) return false; - core.poll_type = settings->input.poll_type_behavior; - if (!core_ctl(CORE_CTL_INIT, NULL)) return false; diff --git a/libretro_version_1.c b/libretro_version_1.c index 2798dad45e..a42047d17a 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -260,13 +260,17 @@ bool core_ctl(enum core_ctl_state state, void *data) retro_set_rewind_callbacks(); break; case CORE_CTL_INIT: - if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL)) - return false; - if (!retro_init_libretro_cbs(&retro_ctx)) - return false; - core_ctl(CORE_CTL_RETRO_GET_SYSTEM_AV_INFO, - video_viewport_get_system_av_info()); - runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL); + { + settings_t *settings = config_get_ptr(); + core.poll_type = settings->input.poll_type_behavior; + if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL)) + return false; + if (!retro_init_libretro_cbs(&retro_ctx)) + return false; + core_ctl(CORE_CTL_RETRO_GET_SYSTEM_AV_INFO, + video_viewport_get_system_av_info()); + runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL); + } break; case CORE_CTL_DEINIT: return retro_uninit_libretro_cbs(&retro_ctx);