h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 12:25:04 +08:00
Code Issues Releases Wiki Activity

Rename GracefullyExit to AttemptExit

Browse Source
This commit is contained in:
Dean Herbert 2022-06-19 12:34:14 +09:00
parent f7fc456bb1
commit 50e40756c4
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/Updater/SquirrelUpdateManager.cs
View File

@ -154,7 +154,7 @@ namespace osu.Desktop.Updater
Activated = () => Activated = () =>
{ {
updateManager.PrepareUpdateAsync() updateManager.PrepareUpdateAsync()
.ContinueWith(_ => updateManager.Schedule(() => game?.GracefullyExit())); .ContinueWith(_ => updateManager.Schedule(() => game?.AttemptExit()));
return true; return true;
}; };
} }

2
osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Setup
dropdown.Items = storage.ListTournaments(); dropdown.Items = storage.ListTournaments();
dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true); dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
Action = () => game.GracefullyExit(); Action = () => game.AttemptExit();
folderButton.Action = () => storage.PresentExternally(); folderButton.Action = () => storage.PresentExternally();
ButtonText = "Close osu!"; ButtonText = "Close osu!";

2
osu.Game/OsuGame.cs
View File

@ -637,7 +637,7 @@ namespace osu.Game
Add(performFromMainMenuTask = new PerformFromMenuRunner(action, validScreens, () => ScreenStack.CurrentScreen)); Add(performFromMainMenuTask = new PerformFromMenuRunner(action, validScreens, () => ScreenStack.CurrentScreen));
} }
public override void GracefullyExit() public override void AttemptExit()
{ {
// Using PerformFromScreen gives the user a chance to interrupt the exit process if needed. // Using PerformFromScreen gives the user a chance to interrupt the exit process if needed.
PerformFromScreen(menu => menu.Exit()); PerformFromScreen(menu => menu.Exit());

5
osu.Game/OsuGameBase.cs
View File

@ -418,13 +418,14 @@ namespace osu.Game
/// <summary> /// <summary>
/// Use to programatically exit the game as if the user was triggering via alt-f4. /// Use to programatically exit the game as if the user was triggering via alt-f4.
/// By default, will keep persisting until an exit occurs (exit may be blocked multiple times). /// By default, will keep persisting until an exit occurs (exit may be blocked multiple times).
/// May be interrupted (see <see cref="OsuGame"/>'s override.
/// </summary> /// </summary>
public virtual void GracefullyExit() public virtual void AttemptExit()
{ {
if (!OnExiting()) if (!OnExiting())
Exit(); Exit();
else else
Scheduler.AddDelayed(GracefullyExit, 2000); Scheduler.AddDelayed(AttemptExit, 2000);
} }
public bool Migrate(string path) public bool Migrate(string path)

2
osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
dialogOverlay.Push(new ConfirmDialog("To complete this operation, osu! will close. Please open it again to use the new data location.", () => dialogOverlay.Push(new ConfirmDialog("To complete this operation, osu! will close. Please open it again to use the new data location.", () =>
{ {
(storage as OsuStorage)?.ChangeDataPath(target.FullName); (storage as OsuStorage)?.ChangeDataPath(target.FullName);
game.GracefullyExit(); game.AttemptExit();
}, () => { })); }, () => { }));
}, },
() => { })); () => { }));