Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes ICharacterUI scene controls getting disposed when CharacterInterface is removed.

Browse Source 
Fixes #550
This commit is contained in:
Pieter-Jan Briers
2020-01-24 00:54:10 +01:00
parent 664acb140e
commit 5af5a02e31
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -36,6 +36,8 @@ namespace Content.Client.GameObjects.Components.Actor
/// </remarks> /// </remarks>
public SS14Window Window { get; private set; } public SS14Window Window { get; private set; }
private List<ICharacterUI> _uiComponents;
/// <summary> /// <summary>
/// Create the window with all character UIs and bind it to a keypress /// Create the window with all character UIs and bind it to a keypress
/// </summary> /// </summary>
@@ -44,13 +46,13 @@ namespace Content.Client.GameObjects.Components.Actor
base.Initialize(); base.Initialize();
//Use all the character ui interfaced components to create the character window //Use all the character ui interfaced components to create the character window
var uiComponents = Owner.GetAllComponents<ICharacterUI>().ToList(); _uiComponents = Owner.GetAllComponents<ICharacterUI>().ToList();
if (uiComponents.Count == 0) if (_uiComponents.Count == 0)
{ {
return; return;
} }
Window = new CharacterWindow(uiComponents); Window = new CharacterWindow(_uiComponents);
Window.OnClose += () => _gameHud.CharacterButtonDown = false; Window.OnClose += () => _gameHud.CharacterButtonDown = false;
} }
@@ -61,7 +63,15 @@ namespace Content.Client.GameObjects.Components.Actor
{ {
base.OnRemove(); base.OnRemove();
Window?.Dispose(); foreach (var component in _uiComponents)
{
// Make sure these don't get deleted when the window is disposed.
component.Scene.Orphan();
}
_uiComponents = null;
Window?.Close();
Window = null; Window = null;
var inputMgr = IoCManager.Resolve<IInputManager>(); var inputMgr = IoCManager.Resolve<IInputManager>();