[Scummvm-git-logs] scummvm master -> 0128d5e3b5efccf3fae40d225f151d6621486f91

SupSuper supsuper at gmail.com
Sun Nov 1 20:10:31 UTC 2020


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:
0128d5e3b5 OPENGLSDL: Fix SDL asserting when getting fullscreen state


Commit: 0128d5e3b5efccf3fae40d225f151d6621486f91
    https://github.com/scummvm/scummvm/commit/0128d5e3b5efccf3fae40d225f151d6621486f91
Author: SupSuper (supsuper at gmail.com)
Date: 2020-11-01T20:10:15Z

Commit Message:
OPENGLSDL: Fix SDL asserting when getting fullscreen state

This fixes a null pointer being passed to SDL_GetWindowFlags
when there is no window yet, since the condition was incomplete

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


diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index fa20f647f5..6ae9529ce0 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -237,7 +237,7 @@ bool OpenGLSdlGraphicsManager::getFeatureState(OSystem::Feature f) const {
 	switch (f) {
 	case OSystem::kFeatureFullscreenMode:
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-		if (_window) {
+		if (_window && _window->getSDLWindow()) {
 			return (SDL_GetWindowFlags(_window->getSDLWindow()) & SDL_WINDOW_FULLSCREEN) != 0;
 		} else {
 			return _wantsFullScreen;




More information about the Scummvm-git-logs mailing list