mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 15:45:19 +00:00
(menu_common_backend.c) don't do early return if driver.menu is
NULL (won't happen with this backend driver)
This commit is contained in:
parent
eae480e279
commit
5664c6d6eb
@ -1419,9 +1419,6 @@ static int menu_settings_iterate(unsigned action)
|
|||||||
unsigned type = 0;
|
unsigned type = 0;
|
||||||
unsigned menu_type = 0;
|
unsigned menu_type = 0;
|
||||||
|
|
||||||
if (!driver.menu)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
driver.menu->frame_buf_pitch = driver.menu->width * 2;
|
driver.menu->frame_buf_pitch = driver.menu->width * 2;
|
||||||
|
|
||||||
if (action != MENU_ACTION_REFRESH)
|
if (action != MENU_ACTION_REFRESH)
|
||||||
@ -1527,9 +1524,6 @@ static int menu_viewport_iterate(unsigned action)
|
|||||||
rarch_viewport_t *custom = (rarch_viewport_t*)
|
rarch_viewport_t *custom = (rarch_viewport_t*)
|
||||||
&g_extern.console.screen.viewports.custom_vp;
|
&g_extern.console.screen.viewports.custom_vp;
|
||||||
|
|
||||||
if (!driver.menu)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
file_list_get_last(driver.menu->menu_stack, NULL, &label, &menu_type);
|
file_list_get_last(driver.menu->menu_stack, NULL, &label, &menu_type);
|
||||||
|
|
||||||
geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry;
|
geom = (struct retro_game_geometry*)&g_extern.system.av_info.geometry;
|
||||||
@ -1787,8 +1781,6 @@ static int menu_custom_bind_iterate_keyboard(void *data, unsigned action)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int menu_action_ok(const char *dir, unsigned menu_type)
|
static int menu_action_ok(const char *dir, unsigned menu_type)
|
||||||
{
|
{
|
||||||
const char *label = NULL;
|
const char *label = NULL;
|
||||||
@ -2105,12 +2097,6 @@ static int menu_common_iterate(unsigned action)
|
|||||||
const char *path = NULL;
|
const char *path = NULL;
|
||||||
const char *menu_label = NULL;
|
const char *menu_label = NULL;
|
||||||
|
|
||||||
if (!driver.menu)
|
|
||||||
{
|
|
||||||
RARCH_ERR("Cannot iterate menu, menu handle is not initialized.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
file_list_get_last(driver.menu->menu_stack, &path, &menu_label, &menu_type);
|
file_list_get_last(driver.menu->menu_stack, &path, &menu_label, &menu_type);
|
||||||
|
|
||||||
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
|
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user