From c709ad1811d521ebfaa18e8693352de07401a6d7 Mon Sep 17 00:00:00 2001 From: srkizer Date: Sun, 17 Mar 2024 04:44:10 +0900 Subject: [PATCH] Make NotificationManager IInternalDisposableService (#1723) Pull request merge order shenanigans. --- .../ImGuiNotification/Internal/NotificationManager.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs b/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs index 272407615..42aad2c45 100644 --- a/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs +++ b/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs @@ -19,7 +19,7 @@ namespace Dalamud.Interface.ImGuiNotification.Internal; /// Class handling notifications/toasts in ImGui. [InterfaceVersion("1.0")] [ServiceManager.EarlyLoadedService] -internal class NotificationManager : INotificationManager, IServiceType, IDisposable +internal class NotificationManager : INotificationManager, IInternalDisposableService { [ServiceManager.ServiceDependency] private readonly GameGui gameGui = Service.Get(); @@ -51,7 +51,7 @@ internal class NotificationManager : INotificationManager, IServiceType, IDispos private IFontAtlas PrivateAtlas { get; } /// - public void Dispose() + public void DisposeService() { this.PrivateAtlas.Dispose(); foreach (var n in this.pendingNotifications) @@ -129,7 +129,7 @@ internal class NotificationManager : INotificationManager, IServiceType, IDispos #pragma warning disable SA1015 [ResolveVia] #pragma warning restore SA1015 -internal class NotificationManagerPluginScoped : INotificationManager, IServiceType, IDisposable +internal class NotificationManagerPluginScoped : INotificationManager, IInternalDisposableService { private readonly LocalPlugin localPlugin; private readonly ConcurrentDictionary notifications = new(); @@ -151,7 +151,7 @@ internal class NotificationManagerPluginScoped : INotificationManager, IServiceT } /// - public void Dispose() + public void DisposeService() { while (!this.notifications.IsEmpty) {