[Scummvm-cvs-logs] scummvm master -> 48564efc8812aef644144cb368d65a8d14a4397f

[fuzzie]

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:
48564efc88 OPENGLSDL: Don't ignore events after user-initiated resizes.


Commit: 48564efc8812aef644144cb368d65a8d14a4397f
    https://github.com/scummvm/scummvm/commit/48564efc8812aef644144cb368d65a8d14a4397f
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2014-07-04T22:37:43+02:00

Commit Message:
OPENGLSDL: Don't ignore events after user-initiated resizes.

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 c3584da..c998f3d 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -356,10 +356,11 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		setActualScreenSize(_hwScreen->w, _hwScreen->h);
 	}
 
-	// Ignore resize events (from SDL) for a few frames. This avoids
-	// bad resizes to a (former) resolution for which we haven't
-	// processed an event yet.
-	_ignoreResizeEvents = 10;
+	// Ignore resize events (from SDL) for a few frames, if this isn't
+	// caused by a notification from SDL. This avoids bad resizes to a
+	// (former) resolution for which we haven't processed an event yet.
+	if (!_gotResize)
+		_ignoreResizeEvents = 10;
 
 	return _hwScreen != nullptr;
 }