diff --git a/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs index a327b401ee..93f4b29431 100644 --- a/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs +++ b/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs @@ -30,7 +30,9 @@ namespace osu.Game.Graphics.UserInterface private void onExited(IScreen lastScreen, IScreen newScreen) { - Current.Value = newScreen; + if (newScreen != null) + Current.Value = newScreen; + Items.ToList().SkipWhile(s => s != Current.Value).Skip(1).ForEach(RemoveItem); } }