From 6563990ad2d9a60b675a51c46ffcc93e5a57c5e7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 9 Jan 2005 15:40:34 +0000
Subject: Fix changing the scaler while GUI scaling and the console are active

svn-id: r16499
---
 gui/console.cpp | 1 +
 gui/newgui.cpp  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui')

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() {
-- 
cgit v1.2.3