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

[rsn8887]

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:
e6add01d72 GUI: never enable checkbox if GUI_ONLY_FULLSCREEN is set


Commit: e6add01d72afbfde21489cb79d2e2b1b1423a5ea
    https://github.com/scummvm/scummvm/commit/e6add01d72afbfde21489cb79d2e2b1b1423a5ea
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2018-01-13T15:21:51-06:00

Commit Message:
GUI: never enable checkbox if GUI_ONLY_FULLSCREEN is set

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 0ffcee4..d1e2be1 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -807,12 +807,14 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
 	_renderModePopUp->setEnabled(enabled);
 	_filteringCheckbox->setEnabled(enabled);
 #ifndef GUI_ENABLE_KEYSDIALOG
+#ifndef GUI_ONLY_FULLSCREEN
 	_fullscreenCheckbox->setEnabled(enabled);
+#endif // !GUI_ONLY_FULLSCREEN
 	if (_guioptions.contains(GUIO_NOASPECT))
 		_aspectCheckbox->setEnabled(false);
 	else
 		_aspectCheckbox->setEnabled(enabled);
-#endif
+#endif // !GUI_ENABLE_KEYSDIALOG
 }
 
 void OptionsDialog::setAudioSettingsState(bool enabled) {