From 36d90e7a875490b7993a39ebec36ef1af0a53661 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 7 Oct 2023 15:55:30 +0200
Subject: [PATCH] Make Archon happy.

---
 Glamourer/Events/GPoseService.cs            | 9 +++------
 Glamourer/Interop/ChangeCustomizeService.cs | 5 ++---
 Glamourer/Services/ServiceManager.cs        | 1 +
 OtterGui                                    | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Glamourer/Events/GPoseService.cs b/Glamourer/Events/GPoseService.cs
index e869cf4..7403754 100644
--- a/Glamourer/Events/GPoseService.cs
+++ b/Glamourer/Events/GPoseService.cs
@@ -5,7 +5,7 @@ using OtterGui.Classes;
 
 namespace Glamourer.Events;
 
-public class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority>
+public sealed class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority>
 {
     private readonly IFramework   _framework;
     private readonly IClientState _state;
@@ -30,11 +30,8 @@ public class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority>
         _framework.Update += OnFramework;
     }
 
-    public new void Dispose()
-    {
-        _framework.Update -= OnFramework;
-        base.Dispose();
-    }
+    protected override void Dispose(bool _)
+        => _framework.Update -= OnFramework;
 
     public void AddActionOnLeave(Action onLeave)
     {
diff --git a/Glamourer/Interop/ChangeCustomizeService.cs b/Glamourer/Interop/ChangeCustomizeService.cs
index f2f2696..0b6f2fb 100644
--- a/Glamourer/Interop/ChangeCustomizeService.cs
+++ b/Glamourer/Interop/ChangeCustomizeService.cs
@@ -17,7 +17,7 @@ namespace Glamourer.Interop;
 /// Changes in Race, body type or Gender are probably ignored.
 /// This operates on draw objects, not game objects.
 /// </summary>
-public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Customize>>, ChangeCustomizeService.Priority>, IDisposable
+public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Customize>>, ChangeCustomizeService.Priority>
 {
     private readonly PenumbraReloaded     _penumbraReloaded;
     private readonly IGameInteropProvider _interop;
@@ -40,9 +40,8 @@ public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Cust
         _penumbraReloaded.Subscribe(Restore, PenumbraReloaded.Priority.ChangeCustomizeService);
     }
 
-    public new void Dispose()
+    protected override void Dispose(bool _)
     {
-        base.Dispose();
         _changeCustomizeHook.Dispose();
         _penumbraReloaded.Unsubscribe(Restore);
     }
diff --git a/Glamourer/Services/ServiceManager.cs b/Glamourer/Services/ServiceManager.cs
index 916c679..a848f96 100644
--- a/Glamourer/Services/ServiceManager.cs
+++ b/Glamourer/Services/ServiceManager.cs
@@ -26,6 +26,7 @@ public static class ServiceManager
 {
     public static ServiceProvider CreateProvider(DalamudPluginInterface pi, Logger log)
     {
+        EventWrapper.ChangeLogger(log);
         var services = new ServiceCollection()
             .AddSingleton(log)
             .AddDalamud(pi)
diff --git a/OtterGui b/OtterGui
index 44ec7c3..34042b1 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 44ec7c38442dad765746abcc0dc838ad3936a0b7
+Subproject commit 34042b15f2dfbb44eb60d3f43e382d3b752d177f