From 1a8219adf6e53f91e2b39487d4854825ff3853bb Mon Sep 17 00:00:00 2001 From: tsrk Date: Sun, 18 Jun 2023 20:20:56 +0200 Subject: [PATCH] style: guard event handler unsubscriptions --- osu.Game/Screens/Play/HUD/KeyCounter.cs | 8 ++++++-- osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Play/HUD/KeyCounter.cs b/osu.Game/Screens/Play/HUD/KeyCounter.cs index f12d2166fc..08d7e79e7c 100644 --- a/osu.Game/Screens/Play/HUD/KeyCounter.cs +++ b/osu.Game/Screens/Play/HUD/KeyCounter.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using osu.Framework.Bindables; +using osu.Framework.Extensions.ObjectExtensions; using osu.Framework.Graphics.Containers; namespace osu.Game.Screens.Play.HUD @@ -48,8 +49,11 @@ namespace osu.Game.Screens.Play.HUD { base.Dispose(isDisposing); - Trigger.OnActivate -= Activate; - Trigger.OnDeactivate -= Deactivate; + if (Trigger.IsNotNull()) + { + Trigger.OnActivate -= Activate; + Trigger.OnDeactivate -= Deactivate; + } } } } diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs index 8b92a5e3b8..efe51d75b0 100644 --- a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs +++ b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Extensions.IEnumerableExtensions; +using osu.Framework.Extensions.ObjectExtensions; using osu.Framework.Graphics.Containers; using osu.Game.Configuration; using osu.Game.Rulesets.UI; @@ -77,7 +78,9 @@ namespace osu.Game.Screens.Play.HUD protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); - controller.OnNewTrigger -= Add; + + if (controller.IsNotNull()) + controller.OnNewTrigger -= Add; } public bool UsesFixedAnchor { get; set; }