From 3c3e90b0df4f208990a4edf1dbb65ef400068681 Mon Sep 17 00:00:00 2001 From: Themaister Date: Tue, 15 Oct 2013 10:29:45 +0200 Subject: [PATCH] Only display autodetect if there are info files. --- core_info.c | 8 ++++++++ core_info.h | 2 ++ frontend/menu/rgui.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core_info.c b/core_info.c index 596c7bbeb4..d232264142 100644 --- a/core_info.c +++ b/core_info.c @@ -149,6 +149,14 @@ void core_info_list_free(core_info_list_t *core_info_list) free(core_info_list); } +size_t core_info_list_num_info_files(core_info_list_t *core_info_list) +{ + size_t num = 0; + for (size_t i = 0; i < core_info_list->count; i++) + num += !!core_info_list->list[i].data; + return num; +} + bool core_info_list_get_display_name(core_info_list_t *core_info_list, const char *path, char *buf, size_t size) { for (size_t i = 0; i < core_info_list->count; i++) diff --git a/core_info.h b/core_info.h index 0b25ac56f8..b46fd0d1f7 100644 --- a/core_info.h +++ b/core_info.h @@ -41,6 +41,8 @@ typedef struct { core_info_list_t *core_info_list_new(const char *modules_path); void core_info_list_free(core_info_list_t *core_info_list); +size_t core_info_list_num_info_files(core_info_list_t *core_info_list); + bool core_info_does_support_file(const core_info_t *core, const char *path); bool core_info_does_support_any_file(const core_info_t *core, const struct string_list *list); diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 10375973d7..a9d8aaec2a 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -255,7 +255,7 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui) if (rgui->history) rgui_list_push(rgui->selection_buf, "Load Game (History)", RGUI_SETTINGS_OPEN_HISTORY, 0); - if (rgui->core_info && rgui->core_info->count) + if (rgui->core_info && core_info_list_num_info_files(rgui->core_info)) rgui_list_push(rgui->selection_buf, "Load Game (Detect Core)", RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE, 0); if (rgui->info.library_name || g_extern.system.info.library_name)