mirror of https://github.com/ppy/osu
Merge branch 'master' into fix-hold-for-menu-icon
This commit is contained in:
commit
8fc0bf24c7
|
@ -68,8 +68,13 @@ private void load()
|
|||
{
|
||||
Cursor = CreateCursor();
|
||||
if (Cursor != null)
|
||||
{
|
||||
// initial showing of the cursor will be handed by MenuCursorContainer (via DrawableRuleset's IProvideCursor implementation).
|
||||
Cursor.Hide();
|
||||
|
||||
AddInternal(Cursor);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Performs post-processing tasks (if any) after all DrawableHitObjects are loaded into this Playfield.
|
||||
|
|
|
@ -110,20 +110,17 @@ public void Restart()
|
|||
adjustableClock.ChangeSource(sourceClock);
|
||||
updateRate();
|
||||
|
||||
this.Delay(750).Schedule(() =>
|
||||
{
|
||||
if (!IsPaused.Value)
|
||||
Start();
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public void Start()
|
||||
{
|
||||
// Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
|
||||
// This accounts for the audio clock source potentially taking time to enter a completely stopped state
|
||||
adjustableClock.Seek(adjustableClock.CurrentTime);
|
||||
Seek(GameplayClock.CurrentTime);
|
||||
adjustableClock.Start();
|
||||
IsPaused.Value = false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue