Take out my own implementation in favor of Ryunam's

configuration.c

@@ -1473,15 +1473,16 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("audio_enable",                  &settings->bools.audio_enable, true, DEFAULT_AUDIO_ENABLE, false);
    SETTING_BOOL("menu_enable_widgets",           &settings->bools.menu_enable_widgets, true, DEFAULT_MENU_ENABLE_WIDGETS, false);
    SETTING_BOOL("menu_show_load_content_animation", &settings->bools.menu_show_load_content_animation, true, DEFAULT_MENU_SHOW_LOAD_CONTENT_ANIMATION, false);
-   SETTING_BOOL("notification_show_screenshot_taken", &settings->bools.notification_show_screenshot_taken, true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN, false);
    SETTING_BOOL("notification_show_autoconfig", &settings->bools.notification_show_autoconfig, true, DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG, false);
    SETTING_BOOL("notification_show_cheats_applied", &settings->bools.notification_show_cheats_applied, true, DEFAULT_NOTIFICATION_SHOW_CHEATS_APPLIED, false);
    SETTING_BOOL("notification_show_remap_load", &settings->bools.notification_show_remap_load, true, DEFAULT_NOTIFICATION_SHOW_REMAP_LOAD, false);
    SETTING_BOOL("notification_show_config_override_load", &settings->bools.notification_show_config_override_load, true, DEFAULT_NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD, false);
    SETTING_BOOL("notification_show_set_initial_disk", &settings->bools.notification_show_set_initial_disk, true, DEFAULT_NOTIFICATION_SHOW_SET_INITIAL_DISK, false);
    SETTING_BOOL("notification_show_fast_forward", &settings->bools.notification_show_fast_forward, true, DEFAULT_NOTIFICATION_SHOW_FAST_FORWARD, false);
+#ifdef HAVE_SCREENSHOTS
    SETTING_BOOL("notification_show_screenshot", &settings->bools.notification_show_screenshot, true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT, false);
    SETTING_BOOL("notification_show_screenshot_flash", &settings->bools.notification_show_screenshot_flash, true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_FLASH, false);
+#endif
    SETTING_BOOL("menu_widget_scale_auto",        &settings->bools.menu_widget_scale_auto, true, DEFAULT_MENU_WIDGET_SCALE_AUTO, false);
    SETTING_BOOL("audio_enable_menu",             &settings->bools.audio_enable_menu, true, audio_enable_menu, false);
    SETTING_BOOL("audio_enable_menu_ok",          &settings->bools.audio_enable_menu_ok, true, audio_enable_menu_ok, false);
@@ -1920,7 +1921,9 @@ static struct config_uint_setting *populate_settings_uint(
    SETTING_UINT("video_rotation",               &settings->uints.video_rotation, true, ORIENTATION_NORMAL, false);
    SETTING_UINT("screen_orientation",           &settings->uints.screen_orientation, true, ORIENTATION_NORMAL, false);
    SETTING_UINT("aspect_ratio_index",           &settings->uints.video_aspect_ratio_idx, true, DEFAULT_ASPECT_RATIO_IDX, false);
+#ifdef HAVE_SCREENSHOTS
    SETTING_UINT("notification_show_screenshot_duration",    &settings->uints.notification_show_screenshot_duration, true, notification_show_screenshot_duration, false);
+#endif
 #ifdef HAVE_NETWORKING
    SETTING_UINT("netplay_ip_port",              &settings->uints.netplay_port,         true, RARCH_DEFAULT_PORT, false);
    SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT);

configuration.h

@@ -159,7 +159,6 @@ typedef struct settings
       bool filter_by_current_core;
       bool menu_enable_widgets;
       bool menu_show_load_content_animation;
-      bool notification_show_screenshot_taken;
       bool notification_show_autoconfig;
       bool notification_show_cheats_applied;
       bool notification_show_remap_load;

intl/msg_hash_lbl.h

@@ -4320,10 +4320,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_NOTIFICATION_SHOW_AUTOCONFIG,
    "notification_show_autoconfig"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-   "notification_show_screenshot_taken"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_NOTIFICATION_SHOW_CHEATS_APPLIED,
    "notification_show_cheats_applied"

intl/msg_hash_us.h

@@ -3408,10 +3408,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_AUTOCONFIG,
    "Input (Autoconfig) Connection Notifications"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-   "Screenshot Notifications"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_CHEATS_APPLIED,
    "Cheat Code Notifications"
@@ -3424,10 +3420,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_AUTOCONFIG,
    "Display an on-screen message when connecting/disconnecting input devices."
    )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-   "Display an on-screen message when screenshots are taken."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_REMAP_LOAD,
    "Input Remap Loaded Notifications"

menu/cbs/menu_cbs_sublabel.c

@@ -381,9 +381,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_restart_retroarch,             MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_widgets,             MENU_ENUM_SUBLABEL_MENU_WIDGETS_ENABLE)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_load_content_animation, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_autoconfig,  MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_AUTOCONFIG)
-#ifdef HAVE_SCREENSHOTS
-DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_screenshot_taken,  MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN)
-#endif
 #ifdef HAVE_CHEATS
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_cheats_applied,  MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_CHEATS_APPLIED)
 #endif
@@ -391,9 +388,11 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_remap_load,  MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_config_override_load, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_set_initial_disk, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SET_INITIAL_DISK)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_fast_forward, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_FAST_FORWARD)
+#ifdef HAVE_SCREENSHOTS
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_screenshot,  MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SCREENSHOT)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_screenshot_duration,  MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SCREENSHOT_DURATION)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_notification_show_screenshot_flash, MENU_ENUM_SUBLABEL_NOTIFICATION_SHOW_SCREENSHOT_FLASH)
+#endif
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_width,            MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_window_height,           MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_fullscreen_x,            MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X)
@@ -2997,11 +2996,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_NOTIFICATION_SHOW_AUTOCONFIG:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_autoconfig);
             break;
-         case MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN:
-#ifdef HAVE_SCREENSHOTS
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_screenshot_taken);
-#endif
-            break;
          case MENU_ENUM_LABEL_NOTIFICATION_SHOW_CHEATS_APPLIED:
 #ifdef HAVE_CHEATS
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_cheats_applied);
@@ -3019,6 +3013,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_NOTIFICATION_SHOW_FAST_FORWARD:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_fast_forward);
             break;
+#ifdef HAVE_SCREENSHOTS
          case MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_screenshot);
             break;
@@ -3028,6 +3023,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_FLASH:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_notification_show_screenshot_flash);
             break;
+#endif
          case MENU_ENUM_LABEL_RESTART_RETROARCH:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_restart_retroarch);
             break;

menu/menu_displaylist.c

@@ -7563,17 +7563,16 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_MEMORY_UPDATE_INTERVAL,                  PARSE_ONLY_UINT,  false },
                {MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION,        PARSE_ONLY_BOOL,  false },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_AUTOCONFIG,            PARSE_ONLY_BOOL,  true },
-#ifdef HAVE_SCREENSHOTS
-               {MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,      PARSE_ONLY_BOOL,  true },
-#endif
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_CHEATS_APPLIED,        PARSE_ONLY_BOOL,  true },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_REMAP_LOAD,            PARSE_ONLY_BOOL,  true },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD,  PARSE_ONLY_BOOL,  true },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_SET_INITIAL_DISK,      PARSE_ONLY_BOOL,  true },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_FAST_FORWARD,          PARSE_ONLY_BOOL,  true },
+#ifdef HAVE_SCREENSHOTS
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT,            PARSE_ONLY_BOOL,  true },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_DURATION,   PARSE_ONLY_UINT,  false },
                {MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_FLASH,      PARSE_ONLY_BOOL,  false },
+#endif
             };
 
             for (i = 0; i < ARRAY_SIZE(build_list); i++)
@@ -7595,18 +7594,22 @@ unsigned menu_displaylist_build_list(
 #ifdef HAVE_GFX_WIDGETS
                   case MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION:
                      if (widgets_supported &&
-                         menu_enable_widgets)
+                           menu_enable_widgets)
                         build_list[i].checked = true;
                      break;
                   case MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_DURATION:
+#ifdef HAVE_SCREENSHOTS
                      if (widgets_supported &&
-                         menu_enable_widgets)
+                           menu_enable_widgets)
                         build_list[i].checked = true;
+#endif
                      break;
                   case MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_FLASH:
+#ifdef HAVE_SCREENSHOTS
                      if (widgets_supported &&
-                         menu_enable_widgets)
+                           menu_enable_widgets)
                         build_list[i].checked = true;
+#endif
                      break;
 #endif
                   default:

menu/menu_setting.c

@@ -12630,21 +12630,6 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_NONE);
 
-         CONFIG_BOOL(
-               list, list_info,
-               &settings->bools.notification_show_screenshot_taken,
-               MENU_ENUM_LABEL_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-               MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-               DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN,
-               MENU_ENUM_LABEL_VALUE_OFF,
-               MENU_ENUM_LABEL_VALUE_ON,
-               &group_info,
-               &subgroup_info,
-               parent_group,
-               general_write_handler,
-               general_read_handler,
-               SD_FLAG_NONE);
-
          CONFIG_BOOL(
                list, list_info,
                &settings->bools.notification_show_cheats_applied,
@@ -12720,6 +12705,7 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_NONE);
 
+#ifdef HAVE_SCREENSHOTS
          CONFIG_BOOL(
                list, list_info,
                &settings->bools.notification_show_screenshot,
@@ -12766,6 +12752,7 @@ static bool setting_append_list(
                general_write_handler,
                general_read_handler,
                SD_FLAG_NONE);
+#endif
 
          END_SUB_GROUP(list, list_info, parent_group);
          END_GROUP(list, list_info, parent_group);

msg_hash.h

@@ -2565,12 +2565,12 @@ enum msg_hash_enums
    MENU_LABEL(MENU_SHOW_LOAD_CONTENT_ANIMATION),
 
    MENU_LABEL(NOTIFICATION_SHOW_AUTOCONFIG),
-   MENU_LABEL(NOTIFICATION_SHOW_SCREENSHOT_TAKEN),
    MENU_LABEL(NOTIFICATION_SHOW_CHEATS_APPLIED),
    MENU_LABEL(NOTIFICATION_SHOW_REMAP_LOAD),
    MENU_LABEL(NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD),
    MENU_LABEL(NOTIFICATION_SHOW_SET_INITIAL_DISK),
    MENU_LABEL(NOTIFICATION_SHOW_FAST_FORWARD),
+#ifdef HAVE_SCREENSHOTS
    MENU_LABEL(NOTIFICATION_SHOW_SCREENSHOT),
    MENU_LABEL(NOTIFICATION_SHOW_SCREENSHOT_DURATION),
    MENU_LABEL(NOTIFICATION_SHOW_SCREENSHOT_FLASH),
@@ -2579,6 +2579,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT_DURATION_FAST,
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT_DURATION_VERY_FAST,
    MENU_ENUM_LABEL_VALUE_NOTIFICATION_SHOW_SCREENSHOT_DURATION_INSTANT,
+#endif
 
    MENU_LABEL(SELECT_FILE),
    MENU_LABEL(SELECT_FROM_PLAYLIST),

tasks/task_screenshot.c

@@ -67,7 +67,6 @@ struct screenshot_task_state
    bool is_paused;
    bool history_list_enable;
    bool widgets_ready;
-   bool widgets_take_screenshot;
 
    int pitch;
    unsigned width;
@@ -237,8 +236,7 @@ static void task_screenshot_callback(retro_task_t *task,
    if (!state)
       return;
 
-   if (!state->silence && state->widgets_ready
+   if (!state->silence && state->widgets_ready)
-         && state->widgets_take_screenshot)
       gfx_widget_screenshot_taken(dispwidget_get_ptr(),
             state->shotname, state->filename);
 
@@ -290,10 +288,8 @@ static bool screenshot_dump(
    state->userbuf                = userbuf;
 #if defined(HAVE_GFX_WIDGETS)
    state->widgets_ready          = gfx_widgets_ready();
-   state->widgets_take_screenshot= settings->bools.notification_show_screenshot_taken;
 #else
    state->widgets_ready          = false;
-   state->widgets_take_screenshot= false;
 #endif
    state->silence                = savestate;
    state->history_list_enable    = settings->bools.history_list_enable;