From 759724facbc96481041bec3c87c119ca419ac4a8 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Dec 2019 06:22:05 +0100
Subject: [PATCH] (Menu) Hide Fullscreen Mode settings if windowed mode is not
 supported by context driver

---
 menu/menu_setting.c | 55 +++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 6aabf9065e..ff53e69dd4 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9434,13 +9434,16 @@ static bool setting_append_list(
             }
 #endif
 
-            CONFIG_ACTION(
-                  list, list_info,
-                  MENU_ENUM_LABEL_VIDEO_FULLSCREEN_MODE_SETTINGS,
-                  MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_MODE_SETTINGS,
-                  &group_info,
-                  &subgroup_info,
-                  parent_group);
+            if (video_driver_has_windowed())
+            {
+               CONFIG_ACTION(
+                     list, list_info,
+                     MENU_ENUM_LABEL_VIDEO_FULLSCREEN_MODE_SETTINGS,
+                     MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_MODE_SETTINGS,
+                     &group_info,
+                     &subgroup_info,
+                     parent_group);
+            }
 
             CONFIG_ACTION(
                   list, list_info,
@@ -9450,26 +9453,23 @@ static bool setting_append_list(
                   &subgroup_info,
                   parent_group);
 
-            if (video_driver_has_windowed())
-            {
-               CONFIG_BOOL(
-                     list, list_info,
-                     &settings->bools.video_fullscreen,
-                     MENU_ENUM_LABEL_VIDEO_FULLSCREEN,
-                     MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
-                     DEFAULT_FULLSCREEN,
-                     MENU_ENUM_LABEL_VALUE_OFF,
-                     MENU_ENUM_LABEL_VALUE_ON,
-                     &group_info,
-                     &subgroup_info,
-                     parent_group,
-                     general_write_handler,
-                     general_read_handler,
-                     SD_FLAG_CMD_APPLY_AUTO);
-               menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE);
-               SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
-            }
-            if (video_driver_has_windowed())
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.video_fullscreen,
+                  MENU_ENUM_LABEL_VIDEO_FULLSCREEN,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
+                  DEFAULT_FULLSCREEN,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_CMD_APPLY_AUTO);
+            menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+
             {
                CONFIG_BOOL(
                      list, list_info,
@@ -9517,6 +9517,7 @@ static bool setting_append_list(
                menu_settings_list_current_add_range(list, list_info, 0, 4320, 8, true, true);
                SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ADVANCED);
             }
+
             CONFIG_FLOAT(
                   list, list_info,
                   &settings->floats.video_refresh_rate,