diff ui/GearComparisonTab.lua @ 33:4ba69d2ee252 v9

fixed bug with gem changes not appearing sometimes, mainWindow crash on startup, lua error for unknown item tooltips
author yellowfive
date Sat, 18 Oct 2014 18:13:55 -0700
parents 44c285acfff0
children
line wrap: on
line diff
--- a/ui/GearComparisonTab.lua	Sat Oct 18 10:33:50 2014 -0700
+++ b/ui/GearComparisonTab.lua	Sat Oct 18 18:13:55 2014 -0700
@@ -318,11 +318,13 @@
                 needsUpgrade = needsUpgrade
             }
         elseif itemEquipped then
-            if AskMrRobot.ExtraItemData[itemEquipped.id] and AskMrRobot.ExtraItemData[itemEquipped.id].socketColors then
-            -- items are same, check for gem/enchant differences
-            --   NOTE: we used to do a bunch of fancy gem checks, but we can ditch all that logic b/c WoD gems are much simpler (no socket bonuses, gem/socket colors to worry about)
+        
+            if AskMrRobot.ExtraItemData[itemImported.id] and AskMrRobot.ExtraItemData[itemImported.id].socketColors then
+            
+                -- items are same, check for gem/enchant differences
+                --   NOTE: we used to do a bunch of fancy gem checks, but we can ditch all that logic b/c WoD gems are much simpler (no socket bonuses, gem/socket colors to worry about)
                 local hasBadGems = false
-                for g = 1, #AskMrRobot.ExtraItemData[itemEquipped.id].socketColors do
+                for g = 1, #AskMrRobot.ExtraItemData[itemImported.id].socketColors do
                     if not AskMrRobot.AreGemsCompatible(itemEquipped.gemIds[g], itemImported.gemIds[g]) then
                         hasBadGems = true
                         break
@@ -335,7 +337,7 @@
                         optimized = {}
                     }
 
-                    for g = 1, #AskMrRobot.ExtraItemData[itemEquipped.id].socketColors do
+                    for g = 1, #AskMrRobot.ExtraItemData[itemImported.id].socketColors do
                         result.gems[slotId].current[g] = itemEquipped.gemIds[g]
                         result.gems[slotId].optimized[g] = itemImported.gemIds[g]
                     end