mirror of
https://github.com/ppy/osu.git
synced 2025-01-17 03:02:55 +08:00
Merge branch 'spectator-replay-watcher' into spectator-listing
This commit is contained in:
commit
6e630e8c88
@ -96,6 +96,10 @@ namespace osu.Game.Rulesets.UI
|
|||||||
else if (!frameStableClock.IsPaused.Value)
|
else if (!frameStableClock.IsPaused.Value)
|
||||||
{
|
{
|
||||||
state = PlaybackState.Valid;
|
state = PlaybackState.Valid;
|
||||||
|
|
||||||
|
if (parentGameplayClock == null)
|
||||||
|
setClock(); // LoadComplete may not be run yet, but we still want the clock.
|
||||||
|
|
||||||
proposedTime = parentGameplayClock.CurrentTime;
|
proposedTime = parentGameplayClock.CurrentTime;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -123,9 +127,6 @@ namespace osu.Game.Rulesets.UI
|
|||||||
|
|
||||||
private void updateClock(ref double proposedTime)
|
private void updateClock(ref double proposedTime)
|
||||||
{
|
{
|
||||||
if (parentGameplayClock == null)
|
|
||||||
setClock(); // LoadComplete may not be run yet, but we still want the clock.
|
|
||||||
|
|
||||||
// each update start with considering things in valid state.
|
// each update start with considering things in valid state.
|
||||||
state = PlaybackState.Valid;
|
state = PlaybackState.Valid;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user