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

[tag2015]

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:
fd47e099e6 AGS: Properly enable vsync following ScummVM setting


Commit: fd47e099e6da49abed1dfcd9e04a924f07c00b43
    https://github.com/scummvm/scummvm/commit/fd47e099e6da49abed1dfcd9e04a924f07c00b43
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-09-02T17:55:18+02:00

Commit Message:
AGS: Properly enable vsync following ScummVM setting

This allows scummvm to override the vsync setting, instead of
 just using the value set in the game acsetup config file

Changed paths:
    engines/ags/engine/main/config.cpp


diff --git a/engines/ags/engine/main/config.cpp b/engines/ags/engine/main/config.cpp
index 0365d673eb4..a555c3c1ca8 100644
--- a/engines/ags/engine/main/config.cpp
+++ b/engines/ags/engine/main/config.cpp
@@ -293,7 +293,13 @@ void apply_config(const ConfigTree &cfg) {
 			parse_scaling_option(CfgReadString(cfg, "graphics", "game_scale_win", "round"), _GP(usetup).Screen.WinGameFrame);
 
 		_GP(usetup).Screen.Params.RefreshRate = CfgReadInt(cfg, "graphics", "refresh");
-		_GP(usetup).Screen.Params.VSync = CfgReadBoolInt(cfg, "graphics", "vsync");
+
+		// Use ScummVM options to set the vsync flag, if available
+		if (ConfMan.hasKey("vsync"))
+			_GP(usetup).Screen.Params.VSync = ConfMan.getBool("vsync");
+		else
+			_GP(usetup).Screen.Params.VSync = CfgReadBoolInt(cfg, "graphics", "vsync");
+
 		_GP(usetup).RenderAtScreenRes = CfgReadBoolInt(cfg, "graphics", "render_at_screenres");
 		_GP(usetup).Supersampling = CfgReadInt(cfg, "graphics", "supersampling", 1);
 		_GP(usetup).software_render_driver = CfgReadString(cfg, "graphics", "software_driver");