[Scummvm-cvs-logs] CVS: scummvm/gui console.cpp,1.54,1.55 newgui.cpp,1.99,1.100

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31090

Modified Files:
	console.cpp newgui.cpp 
Log Message:
Fix changing the scaler while GUI scaling and the console are active

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- console.cpp	6 Jan 2005 19:09:34 -0000	1.54
+++ console.cpp	9 Jan 2005 15:40:33 -0000	1.55
@@ -186,6 +186,7 @@
 		} else if (_slideMode == kUpSlideMode && _y <= -_h) {
 			// End the slide
 			_slideMode = kNoSlideMode;
+			g_gui.enableScaling(true);
 			close();
 		} else
 			draw();

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- newgui.cpp	6 Jan 2005 22:51:25 -0000	1.99
+++ newgui.cpp	9 Jan 2005 15:40:34 -0000	1.100
@@ -235,7 +235,6 @@
 	_lastClick.count = 0;
 
 	_stateIsSaved = true;
-	_scaleEnable = true;
 }
 
 void NewGui::restoreState() {