Merge branch 'master' of https://github.com/libretro/RetroArch

CHANGES.md

@@ -28,6 +28,7 @@
 - LOCALIZATION: Update Portuguese Brazilian translation
 - MENU: Automatically select currently checked item when opening drop-down lists
 - MENU: Fix smooth (vertical) line ticker scroll speed
+- MENU: Don't flush on override/remap messages
 - MENU/BUGFIX: Fix bug - if you were in XMB and you would set menu driver to RGUI, you could no longer go to the left or right tab
 - MENU/MATERIALUI: Add option to remove navigation bar
 - MENU/OZONE: Add DPI-based scaling
@@ -52,6 +53,7 @@
 - VIDEO/WIDGETS: DPI-based scaling
 - VIDEO/WIDGETS: Fix volume widget scaling
 - VIDEO/WIDGETS: Add independent widget scale override settings for fullscreen/windowed modes
+- VIDEO/WIDGETS/BUGFIX: Prevent improper display of (old style) OSD text when widgets are enabled
 - WIFI/CONNMANCTL: Display more characters from SSID
 
 # 1.8.4

configuration.c

@@ -3438,7 +3438,7 @@ bool config_load_override(void *data)
     * since it will be overwritten by the override when reloading. */
    path_set(RARCH_PATH_CORE, buf);
    runloop_msg_queue_push(msg_hash_to_str(MSG_CONFIG_OVERRIDE_LOADED),
-         1, 100, true,
+         1, 100, false,
          NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
    /* Reset save paths. */
@@ -3613,7 +3613,7 @@ bool config_load_remap(const char *directory_input_remapping,
 
 success:
    runloop_msg_queue_push(msg_hash_to_str(
-            MSG_GAME_REMAP_FILE_LOADED), 1, 100, true,
+            MSG_GAME_REMAP_FILE_LOADED), 1, 100, false,
          NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
    free(content_path);
    free(remap_directory);