Merge pull request #49 from GovtGeek/development

Quickslot fix for classic era
GovtGeek · Dec 19, 2024 · 160d96f · 160d96f
2 parents ea3e8b8 + 448f07e
commit 160d96f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Outfitter.toc b/Outfitter.toc
@@ -3,7 +3,7 @@
 ## X-Original-Author: John Stephen
 ## X-Credits: Mundocani, Miv, Gogo, LemonDrake
 ## Title: Outfitter
-## Version: 4.4.1.3
+## Version: 4.4.1.4
 ## Notes: Clothing and weapon management and automated equipment changes
 ## OptionalDeps:
 ## RequiredDeps:

diff --git a/Outfitter.xml b/Outfitter.xml
@@ -1009,6 +1009,7 @@
 								</Anchors>
 								<Scripts>
 									<OnLoad>
+										if Outfitter:IsClassicEra() then OutfitterQuickslotFlyouts:Hide() end
 										getglobal(self:GetName().."Text"):SetText(Outfitter.cEnableQuickslotFlyouts)
 									</OnLoad>
 									<OnClick>

diff --git a/OutfitterQuickSlots.lua b/OutfitterQuickSlots.lua
@@ -33,12 +33,12 @@ function Outfitter._FlyoutQuickSlots:Construct()
 end
 
 function Outfitter._FlyoutQuickSlots:PreClick(pButton, ...)
-	if not Outfitter.Settings.Options.QuickslotFlyouts then return end
+	if not Outfitter.Settings.Options.QuickslotFlyouts or Outfitter:IsClassicEra() then return end
 	self.CurrentInventorySlot = Outfitter.cSlotIDToInventorySlot[pButton:GetID()]
 end
 
 function Outfitter._FlyoutQuickSlots:PostClick(pButton, ...)
-	if not Outfitter.Settings.Options.QuickslotFlyouts then return end
+	if not Outfitter.Settings.Options.QuickslotFlyouts or Outfitter:IsClassicEra() then return end
 	local vSlotItemLink = Outfitter:GetInventorySlotIDLink(pButton.id or pButton:GetID())
 
 	if EquipmentFlyoutFrame:IsVisible() and EquipmentFlyoutFrame.button == pButton then

diff --git a/Outfitter_Mainline.toc b/Outfitter_Mainline.toc
@@ -3,7 +3,7 @@
 ## X-Original-Author: John Stephen
 ## X-Credits: Mundocani, Miv, Gogo, LemonDrake
 ## Title: Outfitter
-## Version: 4.4.1.3
+## Version: 4.4.1.4
 ## Notes: Clothing and weapon management and automated equipment changes
 ## AddonCompartmentFunc: Outfitter_OnAddonCompartmentClick
 #### AddonCompartmentFuncOnEnter: