Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index a06b9a6e..6614feb9 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -243,6 +243,9 @@ void BrowserBox::mouseMoved(gcn::MouseEvent &event)
 
 void BrowserBox::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     if (mOpaque)
     {
         graphics->setColor(gcn::Color(BGCOLOR));