From 50e40756c462318ddebb812fe317c57ec1a4de70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 19 Jun 2022 12:34:14 +0900
Subject: [PATCH] Rename `GracefullyExit` to `AttemptExit`

---
 osu.Desktop/Updater/SquirrelUpdateManager.cs                 | 2 +-
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs      | 2 +-
 osu.Game/OsuGame.cs                                          | 2 +-
 osu.Game/OsuGameBase.cs                                      | 5 +++--
 .../Settings/Sections/Maintenance/MigrationSelectScreen.cs   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 59bc2dabb2..4e5f8d37b1 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -154,7 +154,7 @@ namespace osu.Desktop.Updater
                 Activated = () =>
                 {
                     updateManager.PrepareUpdateAsync()
-                                 .ContinueWith(_ => updateManager.Schedule(() => game?.GracefullyExit()));
+                                 .ContinueWith(_ => updateManager.Schedule(() => game?.AttemptExit()));
                     return true;
                 };
             }
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index fb33b3662a..447d6f44ce 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Setup
             dropdown.Items = storage.ListTournaments();
             dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
-            Action = () => game.GracefullyExit();
+            Action = () => game.AttemptExit();
             folderButton.Action = () => storage.PresentExternally();
 
             ButtonText = "Close osu!";
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 06ade5a3c9..97476358b1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -637,7 +637,7 @@ namespace osu.Game
             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.
             PerformFromScreen(menu => menu.Exit());
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4a9f74d195..1385c06640 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -418,13 +418,14 @@ namespace osu.Game
         /// <summary>
         /// 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).
+        /// May be interrupted (see <see cref="OsuGame"/>'s override.
         /// </summary>
-        public virtual void GracefullyExit()
+        public virtual void AttemptExit()
         {
             if (!OnExiting())
                 Exit();
             else
-                Scheduler.AddDelayed(GracefullyExit, 2000);
+                Scheduler.AddDelayed(AttemptExit, 2000);
         }
 
         public bool Migrate(string path)
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 7e6341cd1b..c51a4db71a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -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.", () =>
                                 {
                                     (storage as OsuStorage)?.ChangeDataPath(target.FullName);
-                                    game.GracefullyExit();
+                                    game.AttemptExit();
                                 }, () => { }));
                             },
                             () => { }));