h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Code Issues Releases Wiki Activity

Fix player loading sequence continuing even when a priority overlay is visible

Browse Source
This commit is contained in:
Dean Herbert 2020-02-14 19:02:37 +09:00
parent 47325601f4
commit 4d4ec3515d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -67,7 +67,14 @@ namespace osu.Game.Screens.Play
}
private bool readyForPush =>
player.LoadState == LoadState.Ready && (IsHovered || idleTracker.IsIdle.Value) && inputManager?.DraggedDrawable == null;
// don't push unless the player is completely loaded
player.LoadState == LoadState.Ready
// don't push if the user is hovering one of the panes, unless they are idle.
&& (IsHovered || idleTracker.IsIdle.Value)
// don't push if the user is dragging a slider or otherwise.
&& inputManager?.DraggedDrawable == null
// don't push if a focused overlay is visible, like settings.
&& inputManager?.FocusedDrawable == null;
private readonly Func<Player> createPlayer;