# HG changeset patch
# User James D. Callahan III <jcallahan@curse.com>
# Date 1349202319 18000
# Node ID ba5422e37516e3b3d2fc8f6f2d1b0f0ae66cfa5c
# Parent  15ff29752523b4e88ce56d02fe9e345eed210226
Always set current_merchant when MERCHANT_SHOW fires.

diff -r 15ff29752523 -r ba5422e37516 Main.lua
--- a/Main.lua	Tue Oct 02 10:58:33 2012 -0500
+++ b/Main.lua	Tue Oct 02 13:25:19 2012 -0500
@@ -1374,7 +1374,7 @@
 
 
     function WDP:UpdateMerchantItems(event_name)
-        if not current_merchant then
+        if not current_merchant or event_name == "MERCHANT_SHOW" then
             local unit_type, unit_idnum = ParseGUID(_G.UnitGUID("target"))
 
             if unit_type ~= private.UNIT_TYPES.NPC or not unit_idnum then