Merge pull request #34205 from bdach/skin-external-edit-safety

Improve safety of external skin edit operation in several scenarios

Author: peppy

osu.Game/Overlays/SkinEditor/ExternalEditOverlay.cs

@@ -8,6 +8,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -47,6 +48,7 @@ public partial class ExternalEditOverlay : OsuFocusedOverlayContainer
 
         private ExternalEditOperation<SkinInfo>? editOperation;
         private TaskCompletionSource? taskCompletionSource;
+        private bool finishingEdit;
 
         protected override bool DimMainContent => false;
 
@@ -95,6 +97,8 @@ private void load()
                     }
                 }
             };
+
+            gameHost.ExitRequested += tryFinishOnExit;
         }
 
         public async Task<Task> Begin(SkinInfo skinInfo)
@@ -179,8 +183,19 @@ private void openDirectory()
             gameHost.OpenFileExternally(editOperation.MountedPath.TrimDirectorySeparator() + Path.DirectorySeparatorChar);
         }
 
+        private void tryFinishOnExit()
+        {
+            if (editOperation != null && !finishingEdit)
+                finish().FireAndForget(onSuccess: () => Schedule(() => finishingEdit = false));
+        }
+
         private async Task finish()
         {
+            if (finishingEdit)
+                return;
+
+            finishingEdit = true;
+
             Debug.Assert(taskCompletionSource != null);
 
             showSpinner("Cleaning up...");
@@ -236,6 +251,7 @@ protected override void PopOut()
             {
                 // Set everything to a clean state
                 editOperation = null;
+                finishingEdit = false;
                 flow.Children = Array.Empty<Drawable>();
             });
         }
@@ -249,7 +265,8 @@ public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
             {
                 case GlobalAction.Back:
                 case GlobalAction.Select:
-                    if (editOperation == null) return base.OnPressed(e);
+                    if (editOperation == null)
+                        return false;
 
                     finish().FireAndForget();
                     return true;
@@ -280,5 +297,13 @@ private void showSpinner(string text)
                 },
             };
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            if (gameHost.IsNotNull())
+                gameHost.ExitRequested -= tryFinishOnExit;
+
+            base.Dispose(isDisposing);
+        }
     }
 }

osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs

@@ -249,7 +249,8 @@ private void updateComponentVisibility()
                 Scheduler.AddOnce(updateScreenSizing);
 
                 game.Toolbar.Hide();
-                game.CloseAllOverlays();
+                if (externalEditOverlay.State.Value != Visibility.Visible)
+                    game.CloseAllOverlays();
             }
             else
             {
@@ -298,7 +299,8 @@ private void setTarget(OsuScreen? target)
 
             if (skinEditor.State.Value == Visibility.Visible)
             {
-                skinEditor.Save(false);
+                if (externalEditOverlay.State.Value != Visibility.Visible)
+                    skinEditor.Save(false);
                 skinEditor.UpdateTargetScreen(target);
                 disableNestedInputManagers();
             }