From f3ea868cf6b3603e88e0899fef6e71bcc800e481 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 24 Feb 2011 23:04:34 +0100
Subject: SDL: Prevent graphics manager hotswapping on startup. (This time for
 real)

---
 backends/platform/sdl/sdl.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 0bc0119a80..bddb48ca95 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -128,7 +128,6 @@ void OSystem_SDL::init() {
 #ifdef USE_OPENGL
 	// Setup a list with both SDL and OpenGL graphics modes
 	setupGraphicsModes();
-	_graphicsMode = _sdlModesCount;
 #endif
 }
 
@@ -149,11 +148,15 @@ void OSystem_SDL::initBackend() {
 			Common::String gfxMode(ConfMan.get("gfx_mode"));
 			bool use_opengl = false;
 			const OSystem::GraphicsMode *mode = OpenGLSdlGraphicsManager::supportedGraphicsModes();
+			int i = 0;
 			while (mode->name) {
-				if (scumm_stricmp(mode->name, gfxMode.c_str()) == 0)
+				if (scumm_stricmp(mode->name, gfxMode.c_str()) == 0) {
+					_graphicsMode = i + _sdlModesCount;
 					use_opengl = true;
+				}
 
 				mode++;
+				++i;
 			}
 
 			// If the gfx_mode is from OpenGL, create the OpenGL graphics manager
-- 
cgit v1.2.3