Shuffle the code around slightly so that while in combat it doesn't ask the watchdog to be quiet, and doesn't bother processing pending updates on the frames, as that won't do anything either.

Mere [10-13-13 - 17:54]
Shuffle the code around slightly so that while in combat it doesn't ask the watchdog to be quiet, and doesn't bother processing pending updates on the frames, as that won't do anything either.
Filename
RaidManagement_LibUnitChange.lua
RiftAddon.toc
diff --git a/RaidManagement_LibUnitChange.lua b/RaidManagement_LibUnitChange.lua
index 61c240b..0cba7a5 100644
--- a/RaidManagement_LibUnitChange.lua
+++ b/RaidManagement_LibUnitChange.lua
@@ -96,9 +96,6 @@ local function UnitChangesComplete(handle, units)
         return
     end

-    -- Doing updates of lots of units can be expensive, ask the watchdog to be quiet.
-    Command.System.Watchdog.Quiet()
-
     MereHealingFrames.Debug(2, "UnitChangeComplete, pending changes: %d", pendingChanges)

     local oldUnitIdBySpec = {}
@@ -156,6 +153,14 @@ local function UnitChangesComplete(handle, units)
     pendingUnitChanges = {}
     pendingChanges = 0

+    if Inspect.System.Secure() then
+        -- no point processing layout changes while in combat, as we can't update the frames
+        return
+    end
+
+    -- doing updates can be expensive
+    Command.System.Watchdog.Quiet()
+
     for layoutName, layout in pairs(MereHealingFrames.Layouts) do
         layout:ProcessPendingLayoutChanges()
     end
diff --git a/RiftAddon.toc b/RiftAddon.toc
index 7a49fba..4d08b7c 100644
--- a/RiftAddon.toc
+++ b/RiftAddon.toc
@@ -7,7 +7,7 @@ Name = "Mere Healing Frames"
 NameShort = "MHF"
 Description = "A set of healing frames"
 Author = "Mere"
-Version = "0.4.36"
+Version = "0.4.37"
 Email = "rift@dokein.co.uk"
 Environment = "2.3"