diff --git a/osu.Game/GameModes/Play/PlaySongSelect.cs b/osu.Game/GameModes/Play/PlaySongSelect.cs index 6353848607..e7f2c141bf 100644 --- a/osu.Game/GameModes/Play/PlaySongSelect.cs +++ b/osu.Game/GameModes/Play/PlaySongSelect.cs @@ -126,8 +126,8 @@ namespace osu.Game.GameModes.Play protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); - - playMode.ValueChanged -= PlayMode_ValueChanged; + if (playMode != null) + playMode.ValueChanged -= PlayMode_ValueChanged; } private void PlayMode_ValueChanged(object sender, EventArgs e)