diff options
| author | Max Horn | 2005-01-09 15:40:34 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-09 15:40:34 +0000 |
| commit | 6563990ad2d9a60b675a51c46ffcc93e5a57c5e7 (patch) | |
| tree | 2a18faa1cdacbc57807ced3cc6589400508a819f /gui | |
| parent | dd9335b232de2e937905773b2c795423eb052a4f (diff) | |
| download | scummvm-rg350-6563990ad2d9a60b675a51c46ffcc93e5a57c5e7.tar.gz scummvm-rg350-6563990ad2d9a60b675a51c46ffcc93e5a57c5e7.tar.bz2 scummvm-rg350-6563990ad2d9a60b675a51c46ffcc93e5a57c5e7.zip | |
Fix changing the scaler while GUI scaling and the console are active
svn-id: r16499
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/console.cpp | 1 | ||||
| -rw-r--r-- | gui/newgui.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index d40606697b..48387e7e9d 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -186,6 +186,7 @@ void ConsoleDialog::handleTickle() { } else if (_slideMode == kUpSlideMode && _y <= -_h) { // End the slide _slideMode = kNoSlideMode; + g_gui.enableScaling(true); close(); } else draw(); diff --git a/gui/newgui.cpp b/gui/newgui.cpp index ea624fbc98..206cec532b 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -235,7 +235,6 @@ void NewGui::saveState() { _lastClick.count = 0; _stateIsSaved = true; - _scaleEnable = true; } void NewGui::restoreState() { |