From c64d91833f0b35ad415ef4a722038ce729bac85b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 26 Feb 2017 22:23:09 +0100
Subject: GUI: Check rect validity for popup/radio drawing

---
 gui/ThemeEngine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 64b25d85f6..8e04b35f45 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1308,7 +1308,7 @@ void ThemeEngine::drawRadiobuttonClip(const Common::Rect &r, const Common::Rect
 	queueDDClip(dd, r2, clippingRect);
 
 	r2.left = r2.right + checkBoxSize;
-	r2.right = r.right;
+	r2.right = MAX(r2.left, r.right);
 
 	queueDDTextClip(getTextData(dd), getTextColor(dd), r2, clippingRect, str, true, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV);
 }
@@ -1519,7 +1519,7 @@ void ThemeEngine::drawPopUpWidgetClip(const Common::Rect &r, const Common::Rect
 
 	queueDDClip(dd, r, clip);
 
-	if (!sel.empty()) {
+	if (!sel.empty() && r.width() >= 13 && r.height() >= 1) {
 		Common::Rect text(r.left + 3, r.top + 1, r.right - 10, r.bottom);
 		queueDDTextClip(getTextData(dd), getTextColor(dd), text, clip, sel, true, false, _widgets[dd]->_textAlignH, _widgets[dd]->_textAlignV, deltax);
 	}
-- 
cgit v1.2.3