[Scummvm-cvs-logs] CVS: scummvm/gui about.cpp,1.28,1.29 about.h,1.10,1.11

[Max Horn]

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

Modified Files:
	about.cpp about.h 
Log Message:
_screenHasChanged == true  implies  _canvas.pixels == null; so replace it (after all, we don't want to draw text when the canvas is not yet ready, no matter whether this is due to a screen change or for any other reason)

Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- about.cpp	16 Apr 2005 12:41:43 -0000	1.28
+++ about.cpp	16 Apr 2005 13:09:34 -0000	1.29
@@ -121,7 +121,6 @@
 	_modifiers = 0;
 	_willClose = false;
 	_canvas.pixels = NULL;
-	_screenHasChanged = false;
 
 	Dialog::open();
 }
@@ -139,7 +138,6 @@
 		// static background for the remainder of the credits.
 		g_gui.blendRect(_x, _y, _w, _h, g_gui._bgcolor);
 		g_gui.copyToSurface(&_canvas, _x, _y, _w, _h);
-		_screenHasChanged = false;
 	}
 
 	g_gui.drawSurface(_canvas, _x, _y);
@@ -216,7 +214,7 @@
 void AboutDialog::handleTickle() {
 	// We're in the process of doing a full redraw. This will be used as
 	// background for the text, so we don't want any text on it.
-	if (_screenHasChanged)
+	if (!_canvas.pixels)
 		return;
 
 	const uint32 t = getMillis();
@@ -246,7 +244,6 @@
 	// Until we have a new canvas, don't draw any credits text.
 	free(_canvas.pixels);
 	_canvas.pixels = NULL;
-	_screenHasChanged = true;
 	draw();
 }
 

Index: about.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- about.h	16 Apr 2005 12:41:43 -0000	1.10
+++ about.h	16 Apr 2005 13:09:34 -0000	1.11
@@ -37,7 +37,6 @@
 	byte		_modifiers;
 	bool		_willClose;
 	Graphics::Surface	_canvas;
-	bool		_screenHasChanged;
 
 public:
 	AboutDialog();