[Scummvm-git-logs] scummvm branch-1-9 -> 4cb859672591521aaa8fcaab1b1ab30fb4715841

[sev-]

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:
4cb8596725 GUI: Do not disable Aspect ratio checkbox with only-fullscreen option


Commit: 4cb859672591521aaa8fcaab1b1ab30fb4715841
    https://github.com/scummvm/scummvm/commit/4cb859672591521aaa8fcaab1b1ab30fb4715841
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-09T11:05:58+02:00

Commit Message:
GUI: Do not disable Aspect ratio checkbox with only-fullscreen option

Changed paths:
    gui/options.cpp



diff --git a/gui/options.cpp b/gui/options.cpp
index 35c9864..6de808c 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -238,11 +238,10 @@ void OptionsDialog::open() {
 #ifdef GUI_ONLY_FULLSCREEN
 		_fullscreenCheckbox->setState(true);
 		_fullscreenCheckbox->setEnabled(false);
-		_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
-		_aspectCheckbox->setEnabled(false);
 #else // !GUI_ONLY_FULLSCREEN
 		// Fullscreen setting
 		_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
+#endif // GUI_ONLY_FULLSCREEN
 
 		// Aspect ratio setting
 		if (_guioptions.contains(GUIO_NOASPECT)) {
@@ -252,7 +251,6 @@ void OptionsDialog::open() {
 			_aspectCheckbox->setEnabled(true);
 			_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
 		}
-#endif // GUI_ONLY_FULLSCREEN
 
 	}