From b96e34946aa326a9f8dfb80ce34cce9fc219405e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 2 Apr 2011 01:23:15 +0300
Subject: Add missing checks.

---
 src/gui/widgets/popup.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/gui/widgets/popup.cpp')

diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 7519d1583..bc15a4c2c 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -142,13 +142,28 @@ void Popup::setLocationRelativeTo(gcn::Widget *widget)
 
 void Popup::setMinWidth(int width)
 {
-    mMinWidth = width > mSkin->getMinWidth() ? width : mSkin->getMinWidth();
+    if (mSkin)
+    {
+        mMinWidth = width > mSkin->getMinWidth()
+            ? width : mSkin->getMinWidth();
+    }
+    else
+    {
+        mMinWidth = width;
+    }
 }
 
 void Popup::setMinHeight(int height)
 {
-    mMinHeight = height > mSkin->getMinHeight() ?
-        height : mSkin->getMinHeight();
+    if (mSkin)
+    {
+        mMinHeight = height > mSkin->getMinHeight() ?
+            height : mSkin->getMinHeight();
+    }
+    else
+    {
+        mMinHeight = height;
+    }
 }
 
 void Popup::setMaxWidth(int width)
-- 
cgit v1.2.3-60-g2f50