ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-21 07:59:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add disposal of ipc

Browse source
This commit is contained in:
Stanley Dimant 2022-06-14 14:51:17 +02:00
parent 9ba9e049fb
commit 0057e5b6a9
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Glamourer/Api/GlamourerIpc.cs
View file

@ -5,10 +5,6 @@ using Dalamud.Logging;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Ipc;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Glamourer.Api namespace Glamourer.Api
{ {
@ -18,16 +14,16 @@ namespace Glamourer.Api
public const string LabelProviderApplyCharacterCustomization = "Glamourer.ApplyCharacterCustomization"; public const string LabelProviderApplyCharacterCustomization = "Glamourer.ApplyCharacterCustomization";
private readonly ClientState clientState; private readonly ClientState clientState;
private readonly ObjectTable objectTable; private readonly ObjectTable objectTable;
private readonly DalamudPluginInterface pi; private readonly DalamudPluginInterface pluginInterface;
internal ICallGateProvider<string>? ProviderGetCharacterCustomization; internal ICallGateProvider<string>? ProviderGetCharacterCustomization;
internal ICallGateProvider<string, string, object>? ProviderApplyCharacterCustomization; internal ICallGateProvider<string, string, object>? ProviderApplyCharacterCustomization;
public GlamourerIpc(ClientState clientState, ObjectTable objectTable, DalamudPluginInterface pi) public GlamourerIpc(ClientState clientState, ObjectTable objectTable, DalamudPluginInterface pluginInterface)
{ {
this.clientState = clientState; this.clientState = clientState;
this.objectTable = objectTable; this.objectTable = objectTable;
this.pi = pi; this.pluginInterface = pluginInterface;
InitializeProviders(); InitializeProviders();
} }
@ -47,7 +43,7 @@ namespace Glamourer.Api
{ {
try try
{ {
ProviderGetCharacterCustomization = pi.GetIpcProvider<string>(LabelProviderGetCharacterCustomization); ProviderGetCharacterCustomization = pluginInterface.GetIpcProvider<string>(LabelProviderGetCharacterCustomization);
ProviderGetCharacterCustomization.RegisterFunc(GetCharacterCustomization); ProviderGetCharacterCustomization.RegisterFunc(GetCharacterCustomization);
} }
catch (Exception ex) catch (Exception ex)
@ -57,7 +53,7 @@ namespace Glamourer.Api
try try
{ {
ProviderApplyCharacterCustomization = pi.GetIpcProvider<string, string, object>(LabelProviderApplyCharacterCustomization); ProviderApplyCharacterCustomization = pluginInterface.GetIpcProvider<string, string, object>(LabelProviderApplyCharacterCustomization);
ProviderApplyCharacterCustomization.RegisterAction((customization, characterName) => ApplyCharacterCustomization(customization, characterName)); ProviderApplyCharacterCustomization.RegisterAction((customization, characterName) => ApplyCharacterCustomization(customization, characterName));
} }
catch (Exception ex) catch (Exception ex)

1
Glamourer/Glamourer.cs
View file

@ -203,6 +203,7 @@ namespace Glamourer
Penumbra.Dispose(); Penumbra.Dispose();
PlayerWatcher.Dispose(); PlayerWatcher.Dispose();
_interface.Dispose(); _interface.Dispose();
GlamourerIpc.Dispose();
Dalamud.Commands.RemoveHandler("/glamour"); Dalamud.Commands.RemoveHandler("/glamour");
Dalamud.Commands.RemoveHandler("/glamourer"); Dalamud.Commands.RemoveHandler("/glamourer");
} }