Fix style issues.

2 files changed, 8 insertions, 11 deletions

diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 726774cdf..7087d563b 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -719,12 +719,9 @@ void ChatWindow::mousePressed(MouseEvent &event)
                 }
                 else
                 {
-                    if (cTab)
-                    {
-                        popupMenu->showChatPopup(viewport->mMouseX,
-                            viewport->mMouseY,
-                            cTab);
-                    }
+                    popupMenu->showChatPopup(viewport->mMouseX,
+                        viewport->mMouseY,
+                        cTab);
                 }
             }
         }
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 05bcda0ae..4ac19daaa 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -172,11 +172,6 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
 
     mItems->addSelectionListener(this);
 
-    ScrollArea *const invenScroll = new ScrollArea(this, mItems,
-        fromBool(getOptionBool("showbackground"), Opaque),
-        "inventory_background.xml");
-    invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
-
     const int size = config.getIntValue("fontSize");
     mFilter = new TabStrip(this, "filter_" + getWindowName(), size + 16);
     mFilter->addActionListener(this);
@@ -194,6 +189,11 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
         return;
     }
 
+    ScrollArea *const invenScroll = new ScrollArea(this, mItems,
+        fromBool(getOptionBool("showbackground"), Opaque),
+        "inventory_background.xml");
+    invenScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+
     switch (mInventory->getType())
     {
         case InventoryType::Inventory: