[Scummvm-git-logs] scummvm master -> 1e510931028104bac997223eaaa18c1b6e921aea

[criezy]

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:
1e51093102 Revert "OPENGL: Fix aspect ratio bug when switching render"


Commit: 1e510931028104bac997223eaaa18c1b6e921aea
    https://github.com/scummvm/scummvm/commit/1e510931028104bac997223eaaa18c1b6e921aea
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-06-02T21:50:18+01:00

Commit Message:
Revert "OPENGL: Fix aspect ratio bug when switching render"

This reverts commit 8af0b8baa501ad84b12d3d679d5fcc0a1146b36a.

That commit introduced a regression causing toggling the
aspect ratio correction using the hotkey to be ignored. And
I checked that reverting the commit did not reintroduced the
bug that it was supposed to fix. However since commit ceca0b5ae
the window size in OpenGL mode no longer depends on whether
the Aspect Ratio correction is enabled or not.

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


diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 8a97f8a58f..45ad4c0fe6 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1217,7 +1217,7 @@ bool OpenGLGraphicsManager::getGLPixelFormat(const Graphics::PixelFormat &pixelF
 }
 
 bool OpenGLGraphicsManager::gameNeedsAspectRatioCorrection() const {
-	if (ConfMan.getBool("aspect_ratio")) {
+	if (_currentState.aspectRatioCorrection) {
 		const uint width = getWidth();
 		const uint height = getHeight();