mirror of
https://github.com/ppy/osu.git
synced 2024-09-22 09:27:34 +08:00
Fix player loading sequence continuing even when a priority overlay is visible
This commit is contained in:
parent
47325601f4
commit
4d4ec3515d
@ -67,7 +67,14 @@ namespace osu.Game.Screens.Play
|
|||||||
}
|
}
|
||||||
|
|
||||||
private bool readyForPush =>
|
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;
|
private readonly Func<Player> createPlayer;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user