From fa0fa03de416a157b84b038467de62cfd96aac2b Mon Sep 17 00:00:00 2001
From: Bastien Bouclet <bastien.bouclet@gmail.com>
Date: Fri, 21 Oct 2016 20:53:42 +0200
Subject: [PATCH] GUI: Fix the initial state of the aspect ratio checkbox

---
 gui/options.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/options.cpp b/gui/options.cpp
index 7ff5a1e190e..22701d64d84 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -219,8 +219,8 @@ void OptionsDialog::open() {
 		// Fullscreen setting
 		_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
 
-		// Aspect ratio setting
-		if (_guioptions.contains(GUIO_NOASPECT)) {
+		// Aspect ratio setting - ResidualVM specific condition
+		if (_guioptions.contains(GUIO_NOASPECT) || !_fullscreenCheckbox->getState()) {
 			_aspectCheckbox->setState(false);
 			_aspectCheckbox->setEnabled(false);
 		} else {