From cd176d07377b70610afbbecb33d95dcf314c2d3c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 25 May 2016 00:57:58 +0200 Subject: [PATCH] Remove input_overlay_init --- command.c | 3 ++- input/input_overlay.c | 10 +--------- input/input_overlay.h | 2 ++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/command.c b/command.c index 2077a07ac3..42a15b16bc 100644 --- a/command.c +++ b/command.c @@ -1864,7 +1864,8 @@ bool command_event(enum event_command cmd, void *data) command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); #ifdef HAVE_OVERLAY input_overlay_free(); - input_overlay_init(); + if (settings->input.overlay_enable) + rarch_task_push_overlay_load_default(input_overlay_loaded, NULL); #endif break; case CMD_EVENT_OVERLAY_NEXT: diff --git a/input/input_overlay.c b/input/input_overlay.c index d8063679fc..68752cb22b 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -499,7 +499,7 @@ void input_overlay_free(void) } /* task_data = overlay_task_data_t* */ -static void input_overlay_loaded(void *task_data, void *user_data, const char *err) +void input_overlay_loaded(void *task_data, void *user_data, const char *err) { size_t i; overlay_task_data_t *data = (overlay_task_data_t*)task_data; @@ -559,14 +559,6 @@ abort_load: free(data); } -void input_overlay_init(void) -{ - settings_t *settings = config_get_ptr(); - if (!settings->input.overlay_enable) - return; - rarch_task_push_overlay_load_default(input_overlay_loaded, NULL); -} - /** * input_overlay_set_alpha_mod: * @ol : Overlay handle. diff --git a/input/input_overlay.h b/input/input_overlay.h index 1ed361957d..9b4ba1c445 100644 --- a/input/input_overlay.h +++ b/input/input_overlay.h @@ -241,6 +241,8 @@ bool input_overlay_key_pressed(int key); bool input_overlay_is_alive(input_overlay_t *ol); +void input_overlay_loaded(void *task_data, void *user_data, const char *err); + #ifdef __cplusplus } #endif