diff --git a/osu.Game.Tests/Visual/TestCaseUserProfile.cs b/osu.Game.Tests/Visual/TestCaseUserProfile.cs
index aca832110a..cb281d045b 100644
--- a/osu.Game.Tests/Visual/TestCaseUserProfile.cs
+++ b/osu.Game.Tests/Visual/TestCaseUserProfile.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Tests.Visual
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
JoinDate = DateTimeOffset.Now.AddDays(-1),
LastVisit = DateTimeOffset.Now,
- Age = 1,
ProfileOrder = new[] { "me" },
Statistics = new UserStatistics
{
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index c72ff6131b..c5510d3d70 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -360,11 +360,6 @@ namespace osu.Game.Overlays.Profile
Text = text
};
- if (user.Age != null)
- {
- infoTextLeft.AddText($"{user.Age} years old ", boldItalic);
- }
-
if (user.Country != null)
{
infoTextLeft.AddText("From ", lightText);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 9c62f92311..85eecd5c1a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -138,7 +138,11 @@ namespace osu.Game.Screens.Select
Height = filter_height,
FilterChanged = c => Carousel.Filter(c),
Background = { Width = 2 },
- Exit = Exit,
+ Exit = () =>
+ {
+ if (IsCurrentScreen)
+ Exit();
+ },
},
}
},
@@ -231,6 +235,10 @@ namespace osu.Game.Screens.Select
/// Whether to trigger .
public void FinaliseSelection(BeatmapInfo beatmap = null, bool performStartAction = true)
{
+ // avoid attempting to continue before a selection has been obtained.
+ // this could happen via a user interaction while the carousel is still in a loading state.
+ if (Carousel.SelectedBeatmap == null) return;
+
// if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed).
Carousel.FlushPendingFilterOperations();
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index e1f68e1ce8..f42df4023f 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -23,9 +23,6 @@ namespace osu.Game.Users
public Bindable Status = new Bindable();
- [JsonProperty(@"age")]
- public int? Age;
-
//public Team Team;
[JsonProperty(@"profile_colour")]