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

[hax0kartik]

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:
a2ce23918f CRAB: Fix bug due to which settings were not mirrored.


Commit: a2ce23918f13e84673453e2cd69cfc748d42f191
    https://github.com/scummvm/scummvm/commit/a2ce23918f13e84673453e2cd69cfc748d42f191
Author: Kartik Agarwala (agarwala.kartik at gmail.com)
Date: 2023-09-07T19:12:35+05:30

Commit Message:
CRAB: Fix bug due to which settings were not mirrored.

Changed paths:
    engines/crab/ScreenSettings.cpp
    engines/crab/ScreenSettings.h
    engines/crab/ui/GfxSettingMenu.cpp


diff --git a/engines/crab/ScreenSettings.cpp b/engines/crab/ScreenSettings.cpp
index b842c15cb10..ee5555ab449 100644
--- a/engines/crab/ScreenSettings.cpp
+++ b/engines/crab/ScreenSettings.cpp
@@ -59,6 +59,14 @@ void ScreenSettings::load(rapidxml::xml_node<char> *node) {
 		_vsync = ConfMan.getBool("vsync");
 }
 
+void ScreenSettings::internalEvents() {
+	if (g_system->hasFeature(OSystem::kFeatureFullscreenMode))
+		_fullscreen = g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
+
+	if (g_system->hasFeature(OSystem::kFeatureVSync))
+		_vsync = g_system->getFeatureState(OSystem::kFeatureVSync);
+}
+
 void ScreenSettings::toggleFullScreen() {
 	if (g_system->hasFeature(OSystem::kFeatureFullscreenMode)) {
 		_fullscreen = !_fullscreen;
diff --git a/engines/crab/ScreenSettings.h b/engines/crab/ScreenSettings.h
index e799898f533..f9038a333cb 100644
--- a/engines/crab/ScreenSettings.h
+++ b/engines/crab/ScreenSettings.h
@@ -127,6 +127,8 @@ public:
 
 	void load(rapidxml::xml_node<char> *node);
 
+	void internalEvents();
+
 	void toggleFullScreen();
 	void toggleVsync();
 
diff --git a/engines/crab/ui/GfxSettingMenu.cpp b/engines/crab/ui/GfxSettingMenu.cpp
index 08160c1e793..f3a0286cca1 100644
--- a/engines/crab/ui/GfxSettingMenu.cpp
+++ b/engines/crab/ui/GfxSettingMenu.cpp
@@ -122,6 +122,8 @@ int GfxSettingMenu::handleEvents(const Common::Event &event) {
 // Purpose: Keep button settings synced with our screen settings
 //------------------------------------------------------------------------
 void GfxSettingMenu::internalEvents() {
+	g_engine->_screenSettings->internalEvents();
+
 	_fullscreen._state = g_engine->_screenSettings->_fullscreen;
 	_vsync._state = g_engine->_screenSettings->_vsync;
 	_border._state = g_engine->_screenSettings->_border;