From 5a7f5099417db3413903a93d55bc4d243f673ff6 Mon Sep 17 00:00:00 2001 From: goat Date: Sun, 12 Feb 2023 21:56:27 +0100 Subject: [PATCH] fix: inherently depend on ChatGui in PluginManager --- Dalamud/IoC/Internal/InherentDependencyAttribute.cs | 2 +- Dalamud/Plugin/Internal/PluginManager.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dalamud/IoC/Internal/InherentDependencyAttribute.cs b/Dalamud/IoC/Internal/InherentDependencyAttribute.cs index f88adf366..612a2dda6 100644 --- a/Dalamud/IoC/Internal/InherentDependencyAttribute.cs +++ b/Dalamud/IoC/Internal/InherentDependencyAttribute.cs @@ -6,7 +6,7 @@ namespace Dalamud.IoC.Internal; /// Mark a class as being dependent on a service, without actually injecting it. /// /// The service to be dependent upon. -[AttributeUsage(AttributeTargets.Class)] +[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] internal class InherentDependencyAttribute : InherentDependencyAttribute where T : IServiceType { } diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index 26ba996e1..a59e83a72 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -35,7 +35,11 @@ namespace Dalamud.Plugin.Internal; /// [ServiceManager.EarlyLoadedService] #pragma warning disable SA1015 +// DalamudTextureWrap registers textures to dispose with IM [InherentDependency] + +// DalamudPluginInterface asks to remove chat link handlers +[InherentDependency] #pragma warning restore SA1015 internal partial class PluginManager : IDisposable, IServiceType {