[Scummvm-git-logs] scummvm master -> 9a861391c861a1d4103df4e28444a375e885da72

[spleen1981]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1800abaaa7 LIBRETRO: BUILD: add -Wno-undefined-var-template
9a861391c8 LIBRETRO: fix close content from quick menu


Commit: 1800abaaa71f3db7ef46c062c13e7169738f3a71
    https://github.com/scummvm/scummvm/commit/1800abaaa71f3db7ef46c062c13e7169738f3a71
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-04-23T00:58:16+02:00

Commit Message:
LIBRETRO: BUILD: add -Wno-undefined-var-template

Changed paths:
    backends/platform/libretro/Makefile.common


diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index e0c17edec53..57d89ac65c8 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -86,7 +86,7 @@ CORE_EXTENSIONS = "scummvm"
 INCLUDES += -I$(SCUMMVM_PATH)
 DEFINES  += -D__LIBRETRO__ -DNONSTANDARD_PORT -DUSE_RGB_COLOR -DUSE_OSD -DDISABLE_TEXT_CONSOLE -DFRONTEND_SUPPORTS_RGB565 -DUSE_TRANSLATION -DDETECTION_STATIC -DHAVE_CONFIG_H -DUSE_BINK -DUSE_LUA -DUSE_TINYGL -DENABLE_VKEYBD
 DEFINES  += -DCORE_NAME=\"$(CORE_NAME)\" -DCORE_EXTENSIONS=\"$(CORE_EXTENSIONS)\"
-CXXFLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
+CXXFLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wno-undefined-var-template
 
 ifeq ($(USE_LIBCO), 1)
    DEFINES += -DUSE_LIBCO


Commit: 9a861391c861a1d4103df4e28444a375e885da72
    https://github.com/scummvm/scummvm/commit/9a861391c861a1d4103df4e28444a375e885da72
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-04-23T00:58:16+02:00

Commit Message:
LIBRETRO: fix close content from quick menu

Changed paths:
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index 265b92a7a22..31bbe5d978c 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -777,7 +777,6 @@ void retro_run(void) {
 				retro_switch_to_emu_thread();
 
 			if (retro_emu_thread_exited()) {
-				retro_deinit_emu_thread();
 				if (!restart_pending) {
 					environ_cb(RETRO_ENVIRONMENT_SHUTDOWN, NULL);
 					log_scummvm_exit_code();
@@ -827,11 +826,14 @@ void retro_run(void) {
 
 void retro_unload_game(void) {
 	retroQuit();
+	while (!retro_emu_thread_exited())
+		retro_switch_to_emu_thread();
+	retro_deinit_emu_thread();
 }
 
 void retro_reset(void) {
 	restart_pending = true;
-	retroQuit();
+	retro_unload_game();
 }
 
 // Stubs