From 034676f33a191a784104875ab689f30332757f5c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 21 Jun 2006 21:35:40 +0000
Subject: Commits fix for crashing about dialog mentioned my Marucs on -devel.

svn-id: r23248
---
 gui/ThemeClassic.cpp | 3 +++
 gui/ThemeNew.cpp     | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'gui')

diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp
index 9c36463fd2..ecdb882f1f 100644
--- a/gui/ThemeClassic.cpp
+++ b/gui/ThemeClassic.cpp
@@ -166,6 +166,9 @@ void ThemeClassic::drawText(const Common::Rect &r, const Common::String &str, St
 	if (!_initOk)
 		return;
 
+	if (r.top < 0 || r.bottom - _font->getFontHeight() >= _screen.h)
+		return;
+
 	if (!inverted) {
 		restoreBackground(r);
 		_font->drawString(&_screen, str, r.left, r.top, r.width(), getColor(state), convertAligment(align), deltax, useEllipsis);
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp
index 1b8b15b9f8..5c87554690 100644
--- a/gui/ThemeNew.cpp
+++ b/gui/ThemeNew.cpp
@@ -303,6 +303,10 @@ void ThemeNew::drawDialogBackground(const Common::Rect &r, uint16 hints, State s
 void ThemeNew::drawText(const Common::Rect &r, const Common::String &str, State state, TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font) {
 	if (!_initOk)
 		return;
+
+	if (r.top < 0 || r.bottom - getFontHeight(font) >= _screen.h)
+		return;
+
 	Common::Rect r2(r.left, r.top, r.right, r.top+getFontHeight(font));
 	uint32 color;
 
-- 
cgit v1.2.3