From 7530436918897b4de15cc838e8a8bd2a46bc1ec0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 7 May 2019 00:32:07 +0200 Subject: [PATCH] Better way to check if there is a resolution list - should hide this entry on Android --- gfx/video_display_server.c | 8 +++++++- gfx/video_display_server.h | 2 ++ menu/menu_displaylist.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c index 5a52fc5302..e496751100 100644 --- a/gfx/video_display_server.c +++ b/gfx/video_display_server.c @@ -108,9 +108,15 @@ bool video_display_server_set_resolution(unsigned width, unsigned height, return false; } +bool video_display_server_has_resolution_list(void) +{ + return (current_display_server + && current_display_server->get_resolution_list); +} + void *video_display_server_get_resolution_list(unsigned *size) { - if (current_display_server && current_display_server->get_resolution_list) + if (video_display_server_has_resolution_list()) return current_display_server->get_resolution_list(current_display_server_data, size); return NULL; } diff --git a/gfx/video_display_server.h b/gfx/video_display_server.h index 995d6a338c..ee9aed210d 100644 --- a/gfx/video_display_server.h +++ b/gfx/video_display_server.h @@ -85,6 +85,8 @@ void video_display_server_set_screen_orientation(enum rotation rotation); bool video_display_server_can_set_screen_orientation(void); +bool video_display_server_has_resolution_list(void); + enum rotation video_display_server_get_screen_orientation(void); extern const video_display_server_t dispserv_win32; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b3425135aa..bae8b7ef1e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5664,7 +5664,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, #if defined(GEKKO) || defined(__CELLOS_LV2__) if (true) #else - if (!string_is_equal(video_display_server_get_ident(), "null")) + if (video_display_server_has_resolution_list()) #endif { menu_displaylist_parse_settings_enum(info->list,