From 3667cde6473a63af42584e0135112f1a35a8fa36 Mon Sep 17 00:00:00 2001
From: Arne De Herdt <arne.de.herdt@gmail.com>
Date: Sat, 13 Jun 2015 11:31:42 +0200
Subject: [PATCH] Vendor Fix

---
 Generalist.lua | 13 ++++++++-----
 toc.xml        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Generalist.lua b/Generalist.lua
index 042327a..4e0de56 100755
--- a/Generalist.lua
+++ b/Generalist.lua
@@ -1645,12 +1645,15 @@ function Generalist:AddTooltipInfo(wndParent, wndTooltip, item)
 	-- Make sure we actually have a tooltip to work with
 	if wndTooltip == nil then return end
 	
-	local wndInv = Apollo.LoadForm(self.xmlDoc, "TooltipInventorySummary",
-		wndTooltip:FindChild("Items"), self)
+	local wndInv = Apollo.LoadForm(self.xmlDoc, "TooltipInventorySummary", wndTooltip:FindChild("Items"), self)
+	
+	-- Carbine changed something in the Vendor Tooltips, making our hook not work.
+	-- Disabling this now for those vendors.
+	if wndInv == nil then return end
+	
 	local wndList = wndInv:FindChild("TooltipInventoryList")
 		
-	-- Now we loop through everyone's inventory to find matches.
-	
+	-- Now we loop through everyone's inventory to find matches.	
 	-- Get the current character's faction
 	local factID = GameLib.GetPlayerUnit():GetFaction()
 	
@@ -1997,4 +2000,4 @@ end
 -- Instantiation
 -----------------------------------------------------------------------------------------------
 local GeneralistInstance = Generalist:new()
-GeneralistInstance:Init()
\ No newline at end of file
+GeneralistInstance:Init()
diff --git a/toc.xml b/toc.xml
index f10ac4e..bb3a3fd 100755
--- a/toc.xml
+++ b/toc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Addon Author="sk4p" APIVersion="10" Name="Generalist" Description="A handy tool for managing alternate characters." Version="1.0.0">
+<Addon Author="sk4p" APIVersion="10" Name="Generalist" Description="A handy tool for managing alternate characters." Version="1.0.1">
 	<Script Name="Generalist.lua"/>
 	<Form Name="Generalist.xml"/>
 </Addon>
\ No newline at end of file