Merge branch 'master' into fix-mania-editor-drag-outside-playfield

Author: bdach

osu.Desktop/OsuGameDesktop.cs

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Performance;
 using osu.Desktop.Security;
@@ -20,7 +19,6 @@
 using osu.Game.Configuration;
 using osu.Game.IO;
 using osu.Game.IPC;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Performance;
 using osu.Game.Utils;
 
@@ -123,7 +121,7 @@ protected override UpdateManager CreateUpdateManager()
 
         public override bool RestartAppWhenExited()
         {
-            Task.Run(() => Velopack.UpdateExe.Start(waitPid: (uint)Environment.ProcessId)).FireAndForget();
+            RestartOnExitAction = () => Velopack.UpdateExe.Start(waitPid: (uint)Environment.ProcessId);
             return true;
         }
 

osu.Desktop/Updater/VelopackUpdateManager.cs

@@ -146,11 +146,11 @@ private void runOutsideOfGameplay(Action action, CancellationToken cancellationT
             action();
         }
 
-        private void restartToApplyUpdate(Velopack.UpdateManager updateManager, UpdateInfo update) => Task.Run(async () =>
+        private void restartToApplyUpdate(Velopack.UpdateManager updateManager, UpdateInfo update)
         {
-            await updateManager.WaitExitThenApplyUpdatesAsync(update.TargetFullRelease).ConfigureAwait(false);
-            Schedule(() => game.AttemptExit());
-        });
+            game.RestartOnExitAction = () => updateManager.WaitExitThenApplyUpdates(update.TargetFullRelease);
+            game.AttemptExit();
+        }
 
         private static void log(string text) => Logger.Log($"VelopackUpdateManager: {text}");
     }

osu.Game/OsuGame.cs

@@ -193,7 +193,7 @@ public partial class OsuGame : OsuGameBase, IKeyBindingHandler<GlobalAction>, IL
 
         protected readonly Bindable<LocalUserPlayingState> UserPlayingState = new Bindable<LocalUserPlayingState>();
 
-        protected OsuScreenStack ScreenStack;
+        public OsuScreenStack ScreenStack { get; private set; }
 
         protected BackButton BackButton => screenStackFooter.BackButton;
         protected ScreenFooter ScreenFooter => screenStackFooter.Footer;

osu.Game/OsuGameBase.cs

@@ -10,6 +10,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
@@ -517,6 +518,8 @@ public override void SetHost(GameHost host)
             host.ExceptionThrown += onExceptionThrown;
         }
 
+        #region Exit handling
+
         /// <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).
@@ -530,12 +533,28 @@ public virtual void AttemptExit()
                 Scheduler.AddDelayed(AttemptExit, 2000);
         }
 
+        /// <summary>
+        /// An action that restarts the application after it has exited.
+        /// </summary>
+        [CanBeNull]
+        public Action RestartOnExitAction { private get; set; }
+
+        /// <summary>
+        /// Signals that the application should not be restarted after it is exited.
+        /// </summary>
+        public void CancelRestartOnExit()
+        {
+            RestartOnExitAction = null;
+        }
+
         /// <summary>
         /// If supported by the platform, the game will automatically restart after the next exit.
         /// </summary>
         /// <returns>Whether a restart operation was queued.</returns>
         public virtual bool RestartAppWhenExited() => false;
 
+        #endregion
+
         /// <summary>
         /// Perform migration of user data to a specified path.
         /// </summary>
@@ -742,6 +761,8 @@ protected override void Dispose(bool isDisposing)
 
             if (Host != null)
                 Host.ExceptionThrown -= onExceptionThrown;
+
+            RestartOnExitAction?.Invoke();
         }
 
         ControlPointInfo IBeatSyncProvider.ControlPoints => Beatmap.Value.BeatmapLoaded ? Beatmap.Value.Beatmap.ControlPointInfo : null;

osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs

@@ -62,7 +62,7 @@ public partial class TabletSettings : InputSubsection
         /// <summary>
         /// Based on ultrawide monitor configurations, plus a bit of lenience for users which are intentionally aiming for higher horizontal velocity.
         /// </summary>
-        private const float largest_feasible_aspect_ratio = 23f / 9;
+        private const float largest_feasible_aspect_ratio = 32f / 9;
 
         private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
         {

osu.Game/Screens/Menu/MainMenu.cs

@@ -429,6 +429,7 @@ public override bool OnExiting(ScreenExitEvent e)
                     }, () =>
                     {
                         holdToExitGameOverlay.Abort();
+                        Game.CancelRestartOnExit();
                     }));
                 }
 

osu.Game/Tests/Visual/OsuGameTestScene.cs

@@ -124,8 +124,6 @@ public partial class TestOsuGame : OsuGame
         {
             public new const float SIDE_OVERLAY_OFFSET_RATIO = OsuGame.SIDE_OVERLAY_OFFSET_RATIO;
 
-            public new ScreenStack ScreenStack => base.ScreenStack;
-
             public RealmAccess Realm => Dependencies.Get<RealmAccess>();
 
             public new GlobalCursorDisplay GlobalCursorDisplay => base.GlobalCursorDisplay;