tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs
View File

@@ -1,9 +1,9 @@
using Content.Shared.GameObjects.Components;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using System.Linq;
using System.Linq;
using Content.Shared.GameObjects.Components;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
namespace Content.Client.GameObjects.Components.Crayon
{
@@ -13,7 +13,7 @@ namespace Content.Client.GameObjects.Components.Crayon
{
}
private CrayonWindow _menu;
private CrayonWindow? _menu;
protected override void Open()
{
@@ -31,7 +31,8 @@ namespace Content.Client.GameObjects.Components.Crayon
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
_menu.UpdateState((CrayonBoundUserInterfaceState) state);
_menu?.UpdateState((CrayonBoundUserInterfaceState) state);
}
public void Select(string state)
@@ -43,7 +44,10 @@ namespace Content.Client.GameObjects.Components.Crayon
{
base.Dispose(disposing);
_menu.Close();
if (disposing)
{
_menu?.Close();
}
}
}
}