Merge branch 'master' into toolbar-rulesets-refactor

This commit is contained in:
Dan Balasescu
2019-06-26 18:33:45 +09:00
committed by GitHub
22 changed files with 235 additions and 134 deletions

View File

@ -212,6 +212,12 @@ namespace osu.Game.Screens.Multi
public override bool OnExiting(IScreen next)
{
if (!(screenStack.CurrentScreen is LoungeSubScreen))
{
screenStack.Exit();
return true;
}
waves.Hide();
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();