Merge branch 'pr-217'

# Conflicts:
#	CHANGELOG.md

Author: mergetest

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Bug Fixes
 
+* (Click Casting) **Fixed all binds being dead in the first arena/dungeon of a fresh session until a reload.** At the first login of a session, the per-spec profile auto-switch could run before the game had your specialization ready — and instead of waiting, it fell back to spec 1 and switched your click-casting to the wrong spec's profile for the rest of the session. The check now recognises when spec data isn't ready yet and re-runs automatically as soon as it arrives (and again at loading screens and arena preparation as a safety net); it is also deferred instead of skipped when it lands during combat. (by Krathe)
 * (Pinned Frames) Fixed a leftover pinned-frame handle (an empty "drag to move" box, often orange) that could stay stuck on screen and survive reloads. The confirmed trigger was switching to a profile with fewer pinned sets than the previous one — the extra set's frame was left behind with no way to hide it. The cleanup now enforces the full rule at every login, profile switch and party/raid change: any pinned frame that the active profile doesn't define, has disabled, or that belongs to the other mode is hidden — so a stuck box is cleaned up no matter how it got stranded. (by Krathe)
 
 ### Improvements

ClickCasting/Bindings.lua

@@ -2408,13 +2408,55 @@ end
 
 -- Process all bindings and build unified macro map
 -- Returns: { [keyString] = { macroText = "...", templateBinding = binding } }
+-- Re-resolve click-casting state once cold-start data becomes available. Two
+-- things can be built before GetSpecialization() resolves at the first login
+-- of a session, and both used to stay wrong all day until a /reload:
+--   * loadoutCheckUnresolved (CheckLoadoutProfileSwitch): the spec→profile
+--     auto-switch could not run (or, before the guard, ran with the `or 1`
+--     spec fallback and switched to the WRONG spec's profile) — the field
+--     report: "none of my binds work in my first arena of the day"
+--   * macroMapUnresolved (BuildUnifiedMacroMap): loadSpec-scoped bindings
+--     were dropped from the map (legacy/import-only config; belt)
+-- Debounced; each resolver clears its own flag on success and self-defers in
+-- combat (pendingLoadoutCheck / needsBindingRefresh). No-op in steady state,
+-- so the extra triggers cost nothing.
+function CC:ResolveProvisionalMap(reason)
+    if not (self.macroMapUnresolved or self.loadoutCheckUnresolved) then return end
+    if not (self.db and self.db.enabled) then return end
+    if self.provisionalResolveTimer then self.provisionalResolveTimer:Cancel() end
+    self.provisionalResolveTimer = C_Timer.NewTimer(0.5, function()
+        CC.provisionalResolveTimer = nil
+        if CC.loadoutCheckUnresolved then
+            DF:Debug("CLICK", "Re-running deferred loadout profile check (%s)", tostring(reason))
+            CC:CheckLoadoutProfileSwitch()
+        end
+        if CC.macroMapUnresolved then
+            DF:Debug("CLICK", "Rebuilding provisional binding map (%s)", tostring(reason))
+            CC:ApplyBindings()
+        end
+    end)
+end
+
 function CC:BuildUnifiedMacroMap()
     local macroMap = {}
-    
+
+    -- Cold-start guard: ShouldBindingLoad drops every loadSpec-scoped binding
+    -- while GetSpecialization() is still nil (first login of a session, before
+    -- spec data resolves). The map is built once and cached, so a map built in
+    -- that window silently loses those bindings — and an all-spec-scoped setup
+    -- comes up EMPTY, which downstream disables clicks on our frames entirely
+    -- ("none of my binds work in my first arena of the day until I reload").
+    -- Record the condition on the module; the resolve watchers (SPELLS_CHANGED /
+    -- PLAYER_SPECIALIZATION_CHANGED / arena prep) rebuild when data arrives, and
+    -- ApplyBindingsToFrameUnified refuses to wipe a frame off a suspect map.
+    local specKnown = GetSpecialization() ~= nil
+    local anySpecScoped = false
+
     -- Group all bindings by their key string
     local keyGroups = {}
     for i, binding in ipairs(self.db.bindings) do
         if binding.enabled ~= false then
+            if binding.loadSpec then anySpecScoped = true end
             local keyString = self:GetBindingKeyString(binding)
             if keyString then
                 if not keyGroups[keyString] then
@@ -2424,6 +2466,11 @@ function CC:BuildUnifiedMacroMap()
             end
         end
     end
+
+    self.macroMapUnresolved = (anySpecScoped and not specKnown) or nil
+    if self.macroMapUnresolved then
+        DF:DebugWarn("CLICK", "BuildUnifiedMacroMap: spec unknown with spec-scoped bindings — map is provisional")
+    end
 
     -- Build macro for each key group
     for keyString, group in pairs(keyGroups) do
@@ -2529,17 +2576,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
             frameName, debugstack(2, 1, 0) or "unknown")
     end
 
-    -- Clear existing bindings first
-    self:ClearBindingsFromFrame(frame)
-    
     -- Build unified macro map if not already built
     if not self.unifiedMacroMap then
         self.unifiedMacroMap = self:BuildUnifiedMacroMap()
         -- Refresh keyboard bindings on all frames since map was just built
         self:RefreshKeyboardBindings()
     end
-    
-    -- Check if this frame has ANY bindings that apply to it
+
+    -- Check if this frame has ANY bindings that apply to it — BEFORE the
+    -- destructive clear below, so a provisional (cold-start) map can bail out
+    -- without touching the frame's existing state.
     local hasAnyBindings = false
     local isDandersFrame = frame.dfIsDandersFrame == true
     local isBlizzardFrame = frame.dfIsBlizzardFrame == true
@@ -2565,6 +2611,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
 
     -- If no bindings apply to this frame
     if not hasAnyBindings then
+        -- Provisional map (spec not yet resolved at build time): the emptiness
+        -- is almost certainly the cold-start drop, not the user's config. Do
+        -- NOT clear/disable anything — leave the frame exactly as it is; the
+        -- resolve watchers rebuild and re-apply once spec data arrives.
+        if self.macroMapUnresolved then
+            DF:Debug("CLICK", "ApplyBindings %s deferred — provisional map (spec unresolved)", frameName)
+            return
+        end
+        -- Genuinely no bindings for this frame: clean it up.
+        self:ClearBindingsFromFrame(frame)
         if isDandersFrame then
             -- For DandersFrames, completely disable clicks when no bindings apply
             -- Our own frames get type1/type2 set in InitializeHeaderChild as a safety net
@@ -2579,7 +2635,11 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
         end
         return
     end
-    
+
+    -- Clear existing bindings first (moved below the applicability check so a
+    -- provisional-map bailout above never strips a frame's working state)
+    self:ClearBindingsFromFrame(frame)
+
     -- Register for clicks based on castOnDown option
     if frame.RegisterForClicks then
         local castOnDown = self.profile and self.profile.options and self.profile.options.castOnDown

ClickCasting/Events.lua

@@ -29,6 +29,9 @@ function CC:RegisterEvents()
     -- Nameplate events for click-casting on nameplates
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_ADDED")
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
+
+    -- Spell data arrival — resolves a provisional (cold-start) binding map
+    eventFrame:RegisterEvent("SPELLS_CHANGED")
 
     eventFrame:SetScript("OnEvent", function(_, event, ...)
         if event == "PLAYER_REGEN_ENABLED" then
@@ -39,6 +42,12 @@ function CC:RegisterEvents()
         elseif event == "PLAYER_SPECIALIZATION_CHANGED" or event == "ACTIVE_PLAYER_SPECIALIZATION_CHANGED" then
             -- Spec changed - check for profile switch
             CC:OnSpecChanged()
+            -- Cold-start resolve: a map built before GetSpecialization()
+            -- resolved dropped every spec-scoped binding — rebuild it now
+            CC:ResolveProvisionalMap("spec-resolved")
+        elseif event == "SPELLS_CHANGED" then
+            -- Spell data arrived/changed — no-op unless the map is provisional
+            CC:ResolveProvisionalMap("spells-changed")
         elseif event == "TRAIT_CONFIG_UPDATED" or event == "TRAIT_CONFIG_CREATED" or event == "ACTIVE_COMBAT_CONFIG_CHANGED" then
             -- Loadout/talent changed - check for profile switch and reapply bindings (with debounce)
             if not InCombatLockdown() then
@@ -96,6 +105,12 @@ function CC:RegisterEvents()
                 -- so a broken hover-bind state never survives a zone change
                 CC:RunBindingRepair("zone-in", true)
 
+                -- Cold-start resolve: if the login build ran before spec data
+                -- was available, the map is provisional — rebuild it on the
+                -- first loading screen so it is correct BEFORE the first
+                -- arena/dungeon of the session, not only after a /reload
+                CC:ResolveProvisionalMap("zone-in")
+
                 -- Check for loadout-based profile on initial load
                 C_Timer.After(1, function()
                     if not InCombatLockdown() then
@@ -105,6 +120,8 @@ function CC:RegisterEvents()
             end)
         elseif event == "ARENA_PREP_OPPONENT_SPECIALIZATIONS" then
             -- Arena frames should now exist
+            -- Belt: never enter an arena on a provisional (cold-start) map
+            CC:ResolveProvisionalMap("arena-prep")
             CC:OnArenaPrep()
         elseif event == "INSTANCE_ENCOUNTER_ENGAGE_UNIT" then
             -- Boss frames should now exist

ClickCasting/Profiles.lua

@@ -492,10 +492,27 @@ end
 -- Check and auto-switch profile based on current loadout
 function CC:CheckLoadoutProfileSwitch()
     if InCombatLockdown() then
-        -- Will be called again when combat ends
+        -- Defer, don't drop: entering an arena/dungeon starts combat quickly,
+        -- and silently losing the check leaves the previous spec's profile
+        -- active for the whole match. OnCombatEnd drains pendingLoadoutCheck.
+        self.pendingLoadoutCheck = true
         return
     end
-    
+
+    -- Cold-start guard: at the first login of a session this can run BEFORE
+    -- GetSpecialization() resolves. GetCurrentSpec()'s `or 1` fallback would
+    -- then MASK the missing data and switch to spec 1's profile — the wrong
+    -- profile for anyone whose actual spec is 2+ ("none of my binds work in
+    -- my first arena of the day until I reload"). Record the unresolved state
+    -- and let the resolve watchers (spec/spell events, loading screens, arena
+    -- prep) re-run this check once real data arrives.
+    if not GetSpecialization() then
+        self.loadoutCheckUnresolved = true
+        DF:Debug("CLICK", "CheckLoadoutProfileSwitch: spec data not ready — deferred to resolve watchers")
+        return
+    end
+    self.loadoutCheckUnresolved = nil
+
     local specIndex = GetCurrentSpec()
     local loadoutID = GetCurrentLoadoutConfigID()
     local assignedProfile, isSpecific = self:GetProfileForLoadout(specIndex, loadoutID)