Skip to content

Commit aa54bd6

Browse files
committed
Fix leaks
1 parent 6659d8d commit aa54bd6

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Brio/Game/Actor/ActorService.cs

-6
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,13 @@ public void UpdateGPoseTable()
5959
if(go != null)
6060
{
6161
_gposeActors.Add(go);
62-
HandleGameObject(go);
6362
}
6463
}
6564
}
6665

6766
public static bool IsGPoseActor(int index) => index >= GPoseFirstActor && index < GPoseFirstActor + GPoseActorCount;
6867
public unsafe static bool IsGPoseActor(GameObject gameObject) => IsGPoseActor(gameObject.AsNative()->ObjectIndex);
6968

70-
private void HandleGameObject(GameObject go)
71-
{
72-
73-
}
74-
7569
public override void Dispose()
7670
{
7771
_gposeActors.Clear();

Brio/Game/Actor/ActorSpawnService.cs

+7
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ public unsafe bool DestroyObject(DalamudGameObject go)
143143
return false;
144144
}
145145

146+
public override void Stop()
147+
{
148+
GPoseService.Instance.OnGPoseStateChange -= GPoseService_OnGPoseStateChange;
149+
ActorService.Instance.OnActorDestructing -= ActorService_OnActorDestructing;
150+
Dalamud.ClientState.TerritoryChanged -= ClientState_TerritoryChanged;
151+
}
152+
146153
public override void Dispose()
147154
{
148155
DestroyAllCreated();

Brio/Game/Actor/PenumbraCollectionService.cs

+2
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,7 @@ public override void Dispose()
123123
{
124124
CleanupOverrides();
125125
PenumbraIPCService.Instance.OnPenumbraStateChange -= PenumbraIPC_OnPenumbraStateChange;
126+
ActorService.Instance.OnActorDestructing -= ActorService_OnActorDestructing;
127+
126128
}
127129
}

Brio/UI/UIService.cs

+2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ private void UiBuilder_OpenConfigUi()
7070

7171
public override void Stop()
7272
{
73+
GPoseService.Instance.OnGPoseStateChange -= Instance_OnGPoseStateChange;
7374
Dalamud.PluginInterface.UiBuilder.Draw -= UiBuilder_Draw;
7475
Dalamud.PluginInterface.UiBuilder.OpenConfigUi -= UiBuilder_OpenConfigUi;
76+
7577
WindowSystem.RemoveAllWindows();
7678
}
7779
}

0 commit comments

Comments
 (0)