From b8c99f1839074adb681ad2062d51ba6cf2fe7ecc Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Wed, 10 Mar 2021 14:25:39 -0500
Subject: [PATCH] fix: use effective layout everywhere

---
 HUD Manager/Hud.cs      | 2 +-
 HUD Manager/Plugin.cs   | 4 +---
 HUD Manager/PluginUi.cs | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/HUD Manager/Hud.cs b/HUD Manager/Hud.cs
index bba55b0..05479ca 100644
--- a/HUD Manager/Hud.cs	
+++ b/HUD Manager/Hud.cs	
@@ -106,7 +106,7 @@ namespace HUD_Manager {
             return Marshal.PtrToStructure<Layout>(slotPtr);
         }
 
-        public void WriteLayout(HudSlot slot, Layout layout) {
+        private void WriteLayout(HudSlot slot, Layout layout) {
             var slotPtr = this.GetLayoutPointer(slot);
 
             var dict = layout.ToDictionary();
diff --git a/HUD Manager/Plugin.cs b/HUD Manager/Plugin.cs
index 9dbc4e6..51ffd72 100644
--- a/HUD Manager/Plugin.cs	
+++ b/HUD Manager/Plugin.cs	
@@ -78,9 +78,7 @@ namespace HUD_Manager {
                 return;
             }
 
-            var layout = entry.Value;
-
-            this.Hud.WriteLayout(this.Config.StagingSlot, layout.ToLayout());
+            this.Hud.WriteEffectiveLayout(this.Config.StagingSlot, entry.Key);
             this.Hud.SelectSlot(this.Config.StagingSlot, true);
         }
     }
diff --git a/HUD Manager/PluginUi.cs b/HUD Manager/PluginUi.cs
index 9dfe5b8..4015cf0 100644
--- a/HUD Manager/PluginUi.cs	
+++ b/HUD Manager/PluginUi.cs	
@@ -405,7 +405,7 @@ namespace HUD_Manager {
                 }
 
                 if (update) {
-                    this.Plugin.Hud.WriteLayout(this.Plugin.Config.StagingSlot, layout.ToLayout());
+                    this.Plugin.Hud.WriteEffectiveLayout(this.Plugin.Config.StagingSlot, this._selectedEditLayout);
                     this.Plugin.Hud.SelectSlot(this.Plugin.Config.StagingSlot, true);
                 }