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/window.cpp b/src/gui/window.cpp
index ee5613bc..48229ec8 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -168,6 +168,9 @@ void Window::setWindowContainer(WindowContainer *wc)
 
 void Window::draw(gcn::Graphics *graphics)
 {
+    if (!isVisible())
+        return;
+
     Graphics *g = static_cast<Graphics*>(graphics);
 
     g->drawImageRect(0, 0, getWidth(), getHeight(), border);