[Scummvm-git-logs] scummvm master -> b3b3684b4662d0890de0a33a118aef4a3e80cfaf

[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:
b3b3684b46 SDL: Fix starting high resolution game with default scale factor


Commit: b3b3684b4662d0890de0a33a118aef4a3e80cfaf
    https://github.com/scummvm/scummvm/commit/b3b3684b4662d0890de0a33a118aef4a3e80cfaf
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-09-08T21:32:42+01:00

Commit Message:
SDL: Fix starting high resolution game with default scale factor

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


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 36f0aa591c..df5750ec3c 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -716,7 +716,9 @@ void SurfaceSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFo
 
 	if ((int)w != _videoMode.screenWidth || (int)h != _videoMode.screenHeight) {
 		const bool useDefault = defaultGraphicsModeConfig();
-		uint scaleFactor = ConfMan.getInt("scale_factor");
+		int scaleFactor = ConfMan.getInt("scale_factor");
+		if (scaleFactor == -1)
+			scaleFactor = getDefaultScaleFactor();
 		int mode = _videoMode.scalerIndex;
 		if (useDefault && w > 320) {
 			// The default scaler is assumed to be for low