From 52c7195a8ee91f95ef134d9798a47ea313df16c8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 11 Oct 2013 17:35:24 +0300
Subject: Second part of checks from Parasoft C++ Test.

---
 src/gui/widgets/tabs/setup_joystick.cpp |  6 ++--
 src/gui/widgets/tabs/tab.cpp            | 55 ++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 33 deletions(-)

(limited to 'src/gui/widgets/tabs')

diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index 15b6959a9..571d53b6f 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -178,10 +178,8 @@ void Setup_Joystick::apply()
     if (!joystick)
         return;
 
-    config.setValue("joystickEnabled",
-        joystick ? joystick->isEnabled() : false);
+    config.setValue("joystickEnabled", joystick->isEnabled());
 
     config.setValue("useInactiveJoystick", mUseInactiveCheckBox->isSelected());
-    if (joystick)
-        joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
+    joystick->setUseInactive(mUseInactiveCheckBox->isSelected());
 }
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 8c25e7b1d..733d030d2 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -215,47 +215,44 @@ void Tab::draw(gcn::Graphics *graphics)
 
     Graphics *const g = static_cast<Graphics*>(graphics);
 
-    if (skin)
+    // draw tab
+    if (openGLMode != RENDER_SAFE_OPENGL)
     {
-        // draw tab
-        if (openGLMode != RENDER_SAFE_OPENGL)
+        const ImageRect &rect = skin->getBorder();
+        if (mRedraw || mode != mMode || g->getRedraw())
         {
-            const ImageRect &rect = skin->getBorder();
-            if (mRedraw || mode != mMode || g->getRedraw())
-            {
-                mMode = mode;
-                mRedraw = false;
-                mVertexes->clear();
-                g->calcWindow(mVertexes, 0, 0,
-                    mDimension.width, mDimension.height, rect);
-
-                if (mImage)
-                {
-                    const Skin *const skin1 = tabImg[TAB_STANDARD];
-                    if (skin1)
-                    {
-                        const int padding = skin1->getPadding();
-                        g->calcTile(mVertexes, mImage, padding, padding);
-                    }
-                }
-            }
+            mMode = mode;
+            mRedraw = false;
+            mVertexes->clear();
+            g->calcWindow(mVertexes, 0, 0,
+                mDimension.width, mDimension.height, rect);
 
-            g->drawTile(mVertexes);
-        }
-        else
-        {
-            g->drawImageRect(0, 0,
-                mDimension.width, mDimension.height, skin->getBorder());
             if (mImage)
             {
                 const Skin *const skin1 = tabImg[TAB_STANDARD];
                 if (skin1)
                 {
                     const int padding = skin1->getPadding();
-                    g->drawImage(mImage, padding, padding);
+                    g->calcTile(mVertexes, mImage, padding, padding);
                 }
             }
         }
+
+        g->drawTile(mVertexes);
+    }
+    else
+    {
+        g->drawImageRect(0, 0,
+            mDimension.width, mDimension.height, skin->getBorder());
+        if (mImage)
+        {
+            const Skin *const skin1 = tabImg[TAB_STANDARD];
+            if (skin1)
+            {
+                const int padding = skin1->getPadding();
+                g->drawImage(mImage, padding, padding);
+            }
+        }
     }
 
     drawChildren(graphics);
-- 
cgit v1.2.3-70-g09d2