From 8a129355778c327c85d20a711a5324ecd2c35cf7 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 3 Jun 2025 14:45:57 +0900 Subject: [PATCH] Fix null reference in some test scenes --- osu.Game/Screens/SelectV2/Panel.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/SelectV2/Panel.cs b/osu.Game/Screens/SelectV2/Panel.cs index f30c895a3b..ddc9c1beb4 100644 --- a/osu.Game/Screens/SelectV2/Panel.cs +++ b/osu.Game/Screens/SelectV2/Panel.cs @@ -70,13 +70,16 @@ namespace osu.Game.Screens.SelectV2 public sealed override bool ReceivePositionalInputAt(Vector2 screenSpacePos) { + if (item == null) + return TopLevelContent.ReceivePositionalInputAt(screenSpacePos); + var inputRectangle = TopLevelContent.DrawRectangle; // Cover the gaps introduced by the spacing between panels so that user mis-aims don't result in no-ops. inputRectangle = inputRectangle.Inflate(new MarginPadding { - Top = item!.CarouselInputLenienceAbove, - Bottom = item!.CarouselInputLenienceBelow, + Top = item.CarouselInputLenienceAbove, + Bottom = item.CarouselInputLenienceBelow, }); return inputRectangle.Contains(TopLevelContent.ToLocalSpace(screenSpacePos));