Call handleScreenChanged() when opening the console. Otherwise, we may get

garbage and/or crashes if the scaler has changed since the console was created.

svn-id: r23480

2 files changed, 10 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index c6aa400e29..465e294dfb 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ For a more comprehensive changelog for the latest experimental SVN code, see:
    - Fixed various actor walking issues.
 
 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.
diff --git a/gui/console.cpp b/gui/console.cpp
index cab49cccd9..464216a0ad 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -157,6 +157,13 @@ void ConsoleDialog::open() {
 	_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);