From 4c3c945bab97eaaa50d9ccb6eeb9cc1a849d2e80 Mon Sep 17 00:00:00 2001
From: Henrique Santiago <henrique_santiago93@hotmail.com>
Date: Thu, 31 Jan 2013 19:43:42 -0200
Subject: [PATCH] Fix tooltip, minimap

---
 modules/corelib/ui/tooltip.lua   | 2 +-
 modules/gamelib/ui/uiminimap.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/corelib/ui/tooltip.lua b/modules/corelib/ui/tooltip.lua
index 203d0bc6..b1fecc15 100644
--- a/modules/corelib/ui/tooltip.lua
+++ b/modules/corelib/ui/tooltip.lua
@@ -67,7 +67,7 @@ function g_tooltip.terminate()
 end
 
 function g_tooltip.display(text)
-  if text == nil then return end
+  if text == nil or text:len() == 0 then return end
   if not toolTipLabel then return end
 
   toolTipLabel:setText(text)
diff --git a/modules/gamelib/ui/uiminimap.lua b/modules/gamelib/ui/uiminimap.lua
index 90bbed5b..6c2d99ce 100644
--- a/modules/gamelib/ui/uiminimap.lua
+++ b/modules/gamelib/ui/uiminimap.lua
@@ -11,7 +11,7 @@ function UIMinimap:onSetup()
   self.allowFollowLocalPlayer = true
   self.onPositionChange = function() self:followLocalPlayer() end
   self.onAddAutomapFlag = function(pos, icon, description) self:addFlag(pos, icon, description) end
-  self.onRemoveAutomapFlag = function(pos, icon, description) self:addFlag(pos, icon, description) end
+  self.onRemoveAutomapFlag = function(pos, icon, description) self:removeFlag(pos, icon, description) end
   connect(g_game, {
     onAddAutomapFlag = self.onAddAutomapFlag,
     onRemoveAutomapFlag = self.onRemoveAutomapFlag,
@@ -120,7 +120,7 @@ function UIMinimap:getFlag(pos, icon, description)
   local children = self.flagsWidget:getChildren()
   for i=1,#children do
     local flag = children[i]
-    if flag.pos.x == pos.x and flag.pos.y == pos.y and flag.pos.z == pos.z and flag.icon == icon and flag.description == description then
+    if flag.pos.x == pos.x and flag.pos.y == pos.y and flag.pos.z == pos.z then
       return flag
     end
   end