diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index b70dbac4fd..59faba21f3 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -202,7 +202,7 @@ static enum action_iterate_type action_iterate_type(uint32_t hash) * * Returns: 0 on success, -1 if we need to quit out of the loop. **/ -int generic_menu_iterate(bool render_this_frame, enum menu_action action) +int generic_menu_iterate(enum menu_action action) { size_t selection; menu_entry_t entry; @@ -227,8 +227,7 @@ int generic_menu_iterate(bool render_this_frame, enum menu_action action) if (action != MENU_ACTION_NOOP || menu_entries_needs_refresh() || menu_display_ctl(MENU_DISPLAY_CTL_UPDATE_PENDING, NULL)) { - if (render_this_frame) - BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); + BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); } switch (iterate_type) @@ -299,8 +298,7 @@ int generic_menu_iterate(bool render_this_frame, enum menu_action action) break; } - if (render_this_frame) - BIT64_SET(menu->state, MENU_STATE_BLIT); + BIT64_SET(menu->state, MENU_STATE_BLIT); if (BIT64_GET(menu->state, MENU_STATE_POP_STACK)) { diff --git a/menu/drivers/menu_generic.h b/menu/drivers/menu_generic.h index 608a40ed96..5742d29cb4 100644 --- a/menu/drivers/menu_generic.h +++ b/menu/drivers/menu_generic.h @@ -39,7 +39,7 @@ enum action_iterate_type ITERATE_TYPE_BIND }; -int generic_menu_iterate(bool render_this_frame, enum menu_action action); +int generic_menu_iterate(enum menu_action action); bool generic_menu_init_list(void *data); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index aaca8488cd..875e0812b1 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1172,7 +1172,7 @@ static void zarch_context_reset(void) zui_font(menu); } -static int zarch_iterate(bool render_this_frame, enum menu_action action) +static int zarch_iterate(enum menu_action action) { zui_t *zui = NULL; menu_handle_t *menu = menu_driver_get_ptr(); @@ -1185,11 +1185,8 @@ static int zarch_iterate(bool render_this_frame, enum menu_action action) if (!zui) return -1; - if (render_this_frame) - { - BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); - BIT64_SET(menu->state, MENU_STATE_BLIT); - } + BIT64_SET(menu->state, MENU_STATE_RENDER_FRAMEBUFFER); + BIT64_SET(menu->state, MENU_STATE_BLIT); switch (action) { @@ -1209,7 +1206,6 @@ static int zarch_iterate(bool render_this_frame, enum menu_action action) break; } - if (zui->time_to_exit) { RARCH_LOG("Gets here.\n"); diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 54783b627b..3367981d07 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -331,12 +331,12 @@ bool menu_driver_alive(void) return menu_alive; } -int menu_driver_iterate(bool render, enum menu_action action) +int menu_driver_iterate(enum menu_action action) { const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); if (driver->iterate) - return driver->iterate(render, action); + return driver->iterate(action); return -1; } diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 72eb42bd1b..9c21ccbc0c 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -108,7 +108,7 @@ typedef struct menu_ctx_driver { void (*set_texture)(void); void (*render_messagebox)(const char *msg); - int (*iterate)(bool render, enum menu_action action); + int (*iterate)(enum menu_action action); void (*render)(void); void (*frame)(void); void* (*init)(void); @@ -219,7 +219,7 @@ size_t menu_driver_list_get_selection(void); bool menu_environment_cb(menu_environ_cb_t type, void *data); -int menu_driver_iterate(bool render, enum menu_action action); +int menu_driver_iterate(enum menu_action action); int menu_driver_bind_init(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, diff --git a/runloop.c b/runloop.c index 8b7f93bf31..175020ddb2 100644 --- a/runloop.c +++ b/runloop.c @@ -979,7 +979,7 @@ int rarch_main_iterate(unsigned *sleep_ms) #ifdef HAVE_MENU if (menu_driver_alive()) { - if (menu_driver_iterate(true, (enum menu_action)menu_input_frame(input, trigger_input)) == -1) + if (menu_driver_iterate((enum menu_action)menu_input_frame(input, trigger_input)) == -1) rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL); if (!input && settings->menu.pause_libretro)