From acde3339cf89583693bebca2efa10c10e6a0d6b3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Oct 2013 22:00:32 +0200 Subject: [PATCH] (Filebrowser/RMenu) More fixes --- frontend/menu/menu_common.c | 5 ++--- frontend/menu/rmenu.c | 4 +++- frontend/menu/rmenudisp.c | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 8214de86fe..c7772e2ee9 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -396,12 +396,11 @@ void menu_init(void) rarch_fail(1, "menu_init()"); } - strlcpy(rgui->browser->current_dir.extensions, rgui->info.valid_extensions, - sizeof(rgui->browser->current_dir.extensions)); - // Look for zips to extract as well. if (*rgui->info.valid_extensions) { + strlcpy(rgui->browser->current_dir.extensions, rgui->info.valid_extensions, + sizeof(rgui->browser->current_dir.extensions)); strlcat(rgui->browser->current_dir.extensions, "|zip", sizeof(rgui->browser->current_dir.extensions)); } diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 45d08562e7..f1c577d73f 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1431,7 +1431,9 @@ static int rgui_iterate(void *data, unsigned action) } #endif - filebrowser_iterate(rgui->browser, action); + if (action != RGUI_ACTION_OK && + action != RGUI_ACTION_NOOP) + filebrowser_iterate(rgui->browser, action); int ret = -1; diff --git a/frontend/menu/rmenudisp.c b/frontend/menu/rmenudisp.c index 92816f4760..4986f151f2 100644 --- a/frontend/menu/rmenudisp.c +++ b/frontend/menu/rmenudisp.c @@ -165,7 +165,13 @@ static void render_text(void *data) case INGAME_MENU_CUSTOM_RATIO: render_ingame_menu_resize = true; break; + case INGAME_MENU: case INGAME_MENU_SETTINGS: + case INGAME_MENU_VIDEO_OPTIONS: + case INGAME_MENU_SHADER_OPTIONS: + case INGAME_MENU_AUDIO_OPTIONS: + case INGAME_MENU_INPUT_OPTIONS: + case INGAME_MENU_PATH_OPTIONS: render_settings = true; break; case INGAME_MENU_LOAD_GAME_HISTORY: