From 7eab9ea57500ee7010fc33c8f825e3e70ef85cbd Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 29 Aug 2013 17:42:08 +0300
Subject: fix some more missign checks.

---
 src/gui/widgets/popup.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

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

diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 1372c89e2..438b5db29 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -101,23 +101,26 @@ void Popup::draw(gcn::Graphics *graphics)
     BLOCK_START("Popup::draw")
     Graphics *const g = static_cast<Graphics*>(graphics);
 
-    if (openGLMode != 2)
+    if (mSkin)
     {
-        if (mRedraw)
+        if (openGLMode != 2)
+        {
+            if (mRedraw)
+            {
+                mRedraw = false;
+                mVertexes->clear();
+                g->calcWindow(mVertexes, 0, 0,
+                    mDimension.width, mDimension.height,
+                    mSkin->getBorder());
+            }
+
+            g->drawTile(mVertexes);
+        }
+        else
         {
-            mRedraw = false;
-            mVertexes->clear();
-            g->calcWindow(mVertexes, 0, 0,
-                mDimension.width, mDimension.height,
+            g->drawImageRect(0, 0, mDimension.width, mDimension.height,
                 mSkin->getBorder());
         }
-
-        g->drawTile(mVertexes);
-    }
-    else
-    {
-        g->drawImageRect(0, 0, mDimension.width, mDimension.height,
-            mSkin->getBorder());
     }
 
     drawChildren(graphics);
-- 
cgit v1.2.3-60-g2f50