Revert "start reducing calls to menu_clear_navigation"

This reverts commit 202b1e2006a3ca03ef5dbe161ac4a4692af77ab3.
This commit is contained in:
twinaphex 2014-10-12 23:36:54 +02:00
parent 202b1e2006
commit 5f8fb88d19
3 changed files with 4 additions and 5 deletions

View File

@ -403,8 +403,6 @@ int menu_entries_push_list(menu_handle_t *menu,
bool do_action = false;
bool is_history_list = !strcmp(label, "history_list");
menu_clear_navigation(driver.menu);
#if 0
RARCH_LOG("Label is: %s\n", label);
RARCH_LOG("Path is: %s\n", path);

View File

@ -62,6 +62,7 @@ static int action_ok_push_history_list(const char *path,
menu_entries_push(driver.menu->menu_stack,
"", label, type, driver.menu->selection_ptr);
menu_clear_navigation(driver.menu);
menu_entries_push_list(driver.menu, driver.menu->selection_buf,
path, label, type);
return 0;
@ -340,6 +341,7 @@ static int action_ok_file_load_with_detect_core(const char *path,
"deferred_core_list",
0,
driver.menu->selection_ptr);
menu_clear_navigation(driver.menu);
menu_entries_push_list(
driver.menu,
driver.menu->selection_buf,

View File

@ -440,13 +440,12 @@ int menu_shader_manager_setting_toggle(
}
else if (!strcmp(label, "video_shader_pass"))
{
unsigned offset = type - MENU_SETTINGS_SHADER_PASS_0;
hack_shader_pass = offset;
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
struct gfx_shader *shader = (struct gfx_shader*)driver.menu->shader;
struct gfx_shader_pass *shader_pass = NULL;
if (shader)
shader_pass = (struct gfx_shader_pass*)&shader->pass[offset];
shader_pass = (struct gfx_shader_pass*)&shader->pass[hack_shader_pass];
switch (action)
{