From 6f0fadf6634c7981d2103f78572b83291d187312 Mon Sep 17 00:00:00 2001
From: "Johnny C. Lam" <jlam88@gmail.com>
Date: Wed, 10 Apr 2013 07:20:19 +0000
Subject: [PATCH] Sanity-check "mouseover"-related units in OvaleGUID method
 results.

Mouseover and mouseover-derived targets cached by OvaleGUID are not
necessarily valid because the cursor may have moved off the previous
mouseover target (there is no event fired for moving off).  Verify that
the mouseover unit is still there before returning these unit IDs.

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@895 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 OvaleGUID.lua |   31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/OvaleGUID.lua b/OvaleGUID.lua
index 7454c0a..46a2409 100644
--- a/OvaleGUID.lua
+++ b/OvaleGUID.lua
@@ -18,6 +18,7 @@ Ovale.OvaleGUID = OvaleGUID
 local strfind = string.find
 local strsub = string.sub
 local API_GetNumGroupMembers = GetNumGroupMembers
+local API_UnitExists = UnitExists
 local API_UnitGUID = UnitGUID
 local API_UnitName = UnitName
 
@@ -83,10 +84,13 @@ function OvaleGUID:Update(unitId)
 end
 
 function OvaleGUID:GetGUID(unitId)
-	if not self_guid[unitId] then
+	if not unitId then return nil end
+	local guid = self_guid[unitId]
+	if not guid or strfind(unitId, "mouseover") == 1 then
 		self_guid[unitId] = API_UnitGUID(unitId)
+		guid = self_guid[unitId]
 	end
-	return self_guid[unitId]
+	return guid
 end
 
 function OvaleGUID:GetGUIDForName(name)
@@ -96,11 +100,30 @@ end
 function OvaleGUID:GetUnitId(guid)
 	local unitIdTable = self_unitId[guid]
 	if not unitIdTable then return nil end
-	return next(unitIdTable)
+	for unitId in pairs(unitIdTable) do
+		if strfind(unitId, "mouseover") == 1 then
+			if API_UnitExists("mouseover") then
+				return unitId
+			else
+				unitIdTable[unitId] = nil
+				self_guid[unitId] = nil
+			end
+		end
+	end
+	return nil
 end
 
 function OvaleGUID:GetUnitIdForName(name)
-	return self_nameToUnit[name]
+	local unitId = self_nameToUnit[name]
+	if strfind(unitId, "mouseover") == 1 then
+		if API_UnitExists("mouseover") then
+			return unitId
+		else
+			self_nameToUnit[name] = nil
+			return nil
+		end
+	end
+	return unitId
 end
 
 function OvaleGUID:UpdateWithTarget(unitId)
-- 
1.7.9.5