sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ppy/osu into present-recommended

Browse Source 
 Conflicts:
	osu.Game/Screens/Select/SongSelect.cs
This commit is contained in:
Endrik Tombak
2020-05-01 11:06:20 +03:00
parent 16f53991a8 42ce325c1f
commit 33a608fd15
95 changed files with 1399 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/OsuGame.cs
View File

@ -924,10 +924,7 @@ namespace osu.Game
if (ScreenStack.CurrentScreen is Loader)
return false;
if (introScreen == null)
return true;
if (!introScreen.DidLoadMenu || !(ScreenStack.CurrentScreen is IntroScreen))
if (introScreen.DidLoadMenu && !(ScreenStack.CurrentScreen is IntroScreen))
{
Scheduler.Add(introScreen.MakeCurrent);
return true;