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/minimap.cpp b/src/gui/minimap.cpp
index 55c6b3c5..57fd7457 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -112,6 +112,9 @@ void Minimap::draw(gcn::Graphics *graphics)
 {
     setVisible(mShow);
 
+    if (!isVisible())
+        return;
+
     Window::draw(graphics);
 
     if (!mShow)