[Scummvm-git-logs] scummvm master -> bcab93111599c07e9fad7292b6e92db56f19c6b2

[bluegr]

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

Summary:
bcab931115 SDL: Fix crash when switching from OpenGL to another graphics mode


Commit: bcab93111599c07e9fad7292b6e92db56f19c6b2
    https://github.com/scummvm/scummvm/commit/bcab93111599c07e9fad7292b6e92db56f19c6b2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-26T00:00:48+02:00

Commit Message:
SDL: Fix crash when switching from OpenGL to another graphics mode

The crash was introduced in commit 12878afc0 and this reverts part
of the changes in that commit.

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 9a80ea7b99..cba0b77535 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -795,7 +795,7 @@ void SurfaceSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFo
 			// 0 will currently always be Normal1x scaling
 			setGraphicsMode(0);
 		} else {
-			g_system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
+			setGraphicsMode(getGraphicsModeIdByName(ConfMan.get("gfx_mode")));
 		}
 	}