From ebf29b622001190ca65780dc0021f6857e5b31b4 Mon Sep 17 00:00:00 2001
From: Sattva <74269253+Sattva-108@users.noreply.github.com>
Date: Tue, 5 Nov 2024 23:16:53 +0300
Subject: [PATCH] do not enhance professions if ElvUI is Loaded - lock it

---
 Leatrix_Plus.lua | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Leatrix_Plus.lua b/Leatrix_Plus.lua
index 8809ea3..37e7835 100644
--- a/Leatrix_Plus.lua
+++ b/Leatrix_Plus.lua
@@ -3882,9 +3882,10 @@ function LeaPlusLC:Isolated()
                             err == SPELL_FAILED_TARGET_NO_POCKETS or
                             err == ERR_ALREADY_PICKPOCKETED or
                             string.match(err, "Requires") or
-                            string.match(err, "mounted") or
+                            string.match(err, "mount") or
                             string.match(err, "gold") or
-                            string.match(err, "shapeshifted")
+                            string.match(err, "shapeshift") or
+                            string.match(err, "disarm")
 
                     then
                         return OrigErrHandler(self, event, err, ...)
@@ -10071,7 +10072,7 @@ function LeaPlusLC:Player()
     --	Enhance professions
     ----------------------------------------------------------------------
 
-    if LeaPlusLC["EnhanceProfessions"] == "On" then
+    if LeaPlusLC["EnhanceProfessions"] == "On" and not LeaLockList["EnhanceProfessions"] then
 
         -- Set increased height of professions frame and maximum number of recipes listed
         local tall, numTallProfs = 73, 19
@@ -10214,7 +10215,7 @@ function LeaPlusLC:Player()
             TradeSkillFrameAvailableFilterCheckButtonText:SetWordWrap(false)
             TradeSkillFrameAvailableFilterCheckButtonText:SetJustifyH("LEFT")
 
-            -- ElvUI fixes
+            -- ElvUI fixes, in 3.3.5 this code doesnt matter, we dont tweak tradeskill if elvui is loaded
             if LeaPlusLC.ElvUI then
                 local E = LeaPlusLC.ElvUI
                 if E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill then
@@ -16327,6 +16328,10 @@ local function eventHandler(self, event, arg1, arg2, ...)
                             Lock("RestoreChatMessages", reason, "Chat") -- Restore chat messages
                         end
 
+                        if E.private.skins.blizzard.enable and E.private.skins.blizzard.tradeskill then
+                            Lock("EnhanceProfessions", reason, "Interface")
+                        end
+
                         -- Minimap
                         if E.private.general.minimap.enable then
                             Lock("MinimapModder", reason, "Minimap") -- Enhance minimap