aboutsummaryrefslogtreecommitdiff
path: root/gui/options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/options.cpp')
-rw-r--r--gui/options.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 35c9864718..1f6683d388 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
}
@@ -435,13 +433,13 @@ void OptionsDialog::close() {
if (gfxError & OSystem::kTransactionAspectRatioFailed) {
ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain);
message += "\n";
- message += _("the fullscreen setting could not be changed");
+ message += _("the aspect ratio setting could not be changed");
}
if (gfxError & OSystem::kTransactionFullscreenFailed) {
ConfMan.setBool("fullscreen", g_system->getFeatureState(OSystem::kFeatureFullscreenMode), _domain);
message += "\n";
- message += _("the aspect ratio setting could not be changed");
+ message += _("the fullscreen setting could not be changed");
}
// And display the error