[Scummvm-git-logs] scummvm branch-2-7 -> 597c17363ebd4c79cf7c1fcad0242cc14db124f1

[lephilousophe]

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:
53f76dba54 BASE: Fix I18N comment
597c17363e OPENGLSDL: Make sure pipeline is destroyed when Manager is destroyed


Commit: 53f76dba54cfb94fe315a74cb8dbc119b405090e
    https://github.com/scummvm/scummvm/commit/53f76dba54cfb94fe315a74cb8dbc119b405090e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-02-12T18:16:14+01:00

Commit Message:
BASE: Fix I18N comment

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index b9465b3a367..0dd281122cf 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -677,8 +677,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 		bool cancelled = false;
 
 		if (!ConfMan.getGameDomains().empty()) {
-			// I18N: <Add a new folder> must match the translation done in backends/fs/android/android-saf-fs.h
 			GUI::MessageDialog alert(_(
+				// I18N: <Add a new folder> must match the translation done in backends/fs/android/android-saf-fs.h
 				"In this new version of ScummVM Android, significant changes were made to "
 				"the file access system to allow support for modern versions of the Android "
 				"Operating System.\n"
@@ -705,8 +705,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			if (alert.runModal() != GUI::kMessageOK)
 				cancelled = true;
 		} else {
-			// I18N: <Add a new folder> must match the translation done in backends/fs/android/android-saf-fs.h
 			GUI::MessageDialog alert(_(
+				// I18N: <Add a new folder> must match the translation done in backends/fs/android/android-saf-fs.h
 				"In this new version of ScummVM Android, significant changes were made to "
 				"the file access system to allow support for modern versions of the Android "
 				"Operating System.\n"


Commit: 597c17363ebd4c79cf7c1fcad0242cc14db124f1
    https://github.com/scummvm/scummvm/commit/597c17363ebd4c79cf7c1fcad0242cc14db124f1
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-02-12T18:16:14+01:00

Commit Message:
OPENGLSDL: Make sure pipeline is destroyed when Manager is destroyed

When destroying the Manager its context is always destroyed.
Destroying OpenGLGraphicsManager must destroy the pipeline too.

Changed paths:
    backends/graphics/opengl/opengl-graphics.cpp
    backends/graphics/openglsdl/openglsdl-graphics.cpp


diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 19078c46e76..3128b18644c 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -103,6 +103,7 @@ OpenGLGraphicsManager::~OpenGLGraphicsManager() {
 #if !USE_FORCED_GLES
 	ShaderManager::destroy();
 #endif
+	delete _pipeline;
 }
 
 bool OpenGLGraphicsManager::hasFeature(OSystem::Feature f) const {
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index ebc1ccc2a82..19acd13ef70 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -190,6 +190,10 @@ OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	notifyContextDestroy();
 	SDL_GL_DeleteContext(_glContext);
+#else
+	if (_hwScreen) {
+		notifyContextDestroy();
+	}
 #endif
 }