From a408b8918ce91acd15513557202ce213b672a550 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 25 Nov 2023 18:30:43 +0100 Subject: [PATCH 1/3] Make hooks not leak. --- OtterGui | 2 +- Penumbra/Interop/ResourceLoading/TexMdlService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OtterGui b/OtterGui index b09bbcc2..3a1a3f1a 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit b09bbcc276363bc994d90b641871e6280898b6e5 +Subproject commit 3a1a3f1a1f2021b063617ac9b294b579a154706e diff --git a/Penumbra/Interop/ResourceLoading/TexMdlService.cs b/Penumbra/Interop/ResourceLoading/TexMdlService.cs index 68ad518c..b9279f54 100644 --- a/Penumbra/Interop/ResourceLoading/TexMdlService.cs +++ b/Penumbra/Interop/ResourceLoading/TexMdlService.cs @@ -8,7 +8,7 @@ using Penumbra.String.Classes; namespace Penumbra.Interop.ResourceLoading; -public unsafe class TexMdlService +public unsafe class TexMdlService : IDisposable { /// Custom ulong flag to signal our files as opposed to SE files. public static readonly IntPtr CustomFileFlag = new(0xDEADBEEF); From 1101a7a98625e8d51e23473b64ca57e30246a8f7 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Wed, 29 Nov 2023 17:23:37 +0100 Subject: [PATCH 2/3] Make sure the SubstitutionProvider is initialized before the interface. --- Penumbra/Penumbra.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs index ef8a1a05..bcf94ed1 100644 --- a/Penumbra/Penumbra.cs +++ b/Penumbra/Penumbra.cs @@ -85,6 +85,7 @@ public class Penumbra : IDalamudPlugin _services.GetRequiredService(); + _services.GetRequiredService(); // Initialize before Interface. SetupInterface(); SetupApi(); From b7272207755d8f87d35bb1b2cba83eaba69255a0 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Wed, 29 Nov 2023 17:27:09 +0100 Subject: [PATCH 3/3] Update OtterGui. --- OtterGui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OtterGui b/OtterGui index 3a1a3f1a..3e2d4ae9 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit 3a1a3f1a1f2021b063617ac9b294b579a154706e +Subproject commit 3e2d4ae934694918d312280d62127cf1a55b03e4