[Scummvm-cvs-logs] SF.net SVN: scummvm: [23481] scummvm/branches/branch-0-9-0

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:44:57 CEST 2006


Revision: 23481
          http://svn.sourceforge.net/scummvm/?rev=23481&view=rev
Author:   eriktorbjorn
Date:     2006-07-10 08:45:34 -0700 (Mon, 10 Jul 2006)

Log Message:
-----------
Backported fix for potential garbage/crashes after changing scaler when the
debug console wasn't visible.

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/NEWS
    scummvm/branches/branch-0-9-0/gui/console.cpp

Modified: scummvm/branches/branch-0-9-0/NEWS
===================================================================
--- scummvm/branches/branch-0-9-0/NEWS	2006-07-10 15:45:09 UTC (rev 23480)
+++ scummvm/branches/branch-0-9-0/NEWS	2006-07-10 15:45:34 UTC (rev 23481)
@@ -2,6 +2,9 @@
         http://scummvm.sourceforge.net/daily/ChangeLog
 
 0.9.1 (????-??-??)
+ General:
+   - Fixed potential garbage and/or crash in debug console.
+
  SCUMM:
    - Improved support for international versions of HE games.
    - Fixed rare actor drawing glitches.

Modified: scummvm/branches/branch-0-9-0/gui/console.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/gui/console.cpp	2006-07-10 15:45:09 UTC (rev 23480)
+++ scummvm/branches/branch-0-9-0/gui/console.cpp	2006-07-10 15:45:34 UTC (rev 23481)
@@ -157,6 +157,13 @@
 	_slideTime = g_system->getMillis();
 	_slideMode = kDownSlideMode;
 
+	// The screen may have changed since the console was created. We have
+	// to make sure things are properly adjusted, or we may get garbage in
+	// the console, or even outright crashes. This means _scrollLine is not
+	// preserved, but that's a tiny sacrifice.
+
+	handleScreenChanged();
+
 	Dialog::open();
 	if (_promptStartPos == -1) {
 		print(PROMPT);






More information about the Scummvm-git-logs mailing list