RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-24 22:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change default value of requestedByUser to false

Browse Source
This commit is contained in:
Dean Herbert 2020-11-02 14:56:50 +09:00
parent ecad85b5f5
commit d2f6303988
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
if (withUserPause)
AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop());
AddStep("pause", () => Game.Dependencies.Get<MusicController>().Stop(true));
AddStep("press enter", () => pressAndRelease(Key.Enter));

4
osu.Game/Overlays/MusicController.cs
View File

@ -187,7 +187,7 @@ namespace osu.Game.Overlays
/// Specifying <c>true</c> will ensure that other methods like <see cref="EnsurePlayingSomething"/>
/// will not resume music playback until the next explicit call to <see cref="Play"/>.
/// </param>
public void Stop(bool requestedByUser = true)
public void Stop(bool requestedByUser = false)
{
IsUserPaused |= requestedByUser;
if (CurrentTrack.IsRunning)
@ -201,7 +201,7 @@ namespace osu.Game.Overlays
public bool TogglePause()
{
if (CurrentTrack.IsRunning)
Stop();
Stop(true);
else
Play();

2
osu.Game/Screens/Play/Player.cs
View File

@ -472,7 +472,7 @@ namespace osu.Game.Screens.Play
{
// at the point of restarting the track should either already be paused or the volume should be zero.
// stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
musicController.Stop(false);
musicController.Stop();
sampleRestart?.Play();
RestartRequested?.Invoke();

2
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual
rulesetDependencies?.Dispose();
if (MusicController?.TrackLoaded == true)
MusicController.Stop(false);
MusicController.Stop();
if (contextFactory?.IsValueCreated == true)
contextFactory.Value.ResetDatabase();