[Scummvm-git-logs] scummvm master -> 7950a9b215c752bcad11723f7d3835a914311a4b

[bluegr]

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:
7950a9b215 GUI: Refresh stretch mode and shader on returning to launcher


Commit: 7950a9b215c752bcad11723f7d3835a914311a4b
    https://github.com/scummvm/scummvm/commit/7950a9b215c752bcad11723f7d3835a914311a4b
Author: av-dx (aashwin.vaish at research.iiit.ac.in)
Date: 2021-01-24T04:09:09+02:00

Commit Message:
GUI: Refresh stretch mode and shader on returning to launcher

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index d0a33ec184..a88af9cc7c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -344,6 +344,8 @@ static void setupGraphics(OSystem &system) {
 	system.beginGFXTransaction();
 		// Set the user specified graphics mode (if any).
 		system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
+		system.setStretchMode(ConfMan.get("stretch_mode").c_str());
+		system.setShader(ConfMan.get("shader").c_str());
 
 		system.initSize(320, 200);
 
@@ -353,10 +355,6 @@ static void setupGraphics(OSystem &system) {
 			system.setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
 		if (ConfMan.hasKey("filtering"))
 			system.setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering"));
-		if (ConfMan.hasKey("stretch_mode"))
-			system.setStretchMode(ConfMan.get("stretch_mode").c_str());
-		if (ConfMan.hasKey("shader"))
-			system.setShader(ConfMan.get("shader").c_str());
 	system.endGFXTransaction();
 
 	system.applyBackendSettings();