From f3cae240e0c879c18d7e9599830d9693b7ebd7f0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Apr 2014 04:08:44 +0200 Subject: [PATCH] Take out rgui_handle_t dependency in menu_context.c --- frontend/menu/menu_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/menu/menu_context.c b/frontend/menu/menu_context.c index 35e85b9bc0..5a1236b712 100644 --- a/frontend/menu/menu_context.c +++ b/frontend/menu/menu_context.c @@ -84,7 +84,6 @@ bool menu_ctx_init_first(const void **driver_data, void **data) { unsigned i; const menu_ctx_driver_t **driver = (const menu_ctx_driver_t**)driver_data; - rgui_handle_t **handle = (rgui_handle_t**)data; if (!menu_ctx_drivers[0]) return false; @@ -92,10 +91,11 @@ bool menu_ctx_init_first(const void **driver_data, void **data) for (i = 0; menu_ctx_drivers[i]; i++) { void *h = menu_ctx_drivers[i]->init(); + if (h) { *driver = menu_ctx_drivers[i]; - *handle = (rgui_handle_t*)h; + *data = (void*)h; strlcpy(g_settings.menu.driver, menu_ctx_drivers[i]->ident, sizeof(g_settings.menu.driver)); return true; }