Merge pull request #9474 from obrakmann/pr9217

Ensure that we have a working OpenGL context.
2015-09-28 18:26:51 +02:00
parent 7a0a618169 d0447fd97e
commit ebfe5a3fd7
1 changed files with 3 additions and 1 deletions
--- a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs
+++ b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs
@@ -75,7 +75,9 @@ namespace OpenRA.Platforms.Default
 			}

 			context = SDL.SDL_GL_CreateContext(window);
-			SDL.SDL_GL_MakeCurrent(window, context);
+			if (context == IntPtr.Zero || SDL.SDL_GL_MakeCurrent(window, context) < 0)
+				throw new InvalidOperationException("Can not create OpenGL context. (Error: {0})".F(SDL.SDL_GetError()));
+
 			GraphicsContext.CurrentContext = context;

 			GL.LoadAll();