sheets: Avoid calling Hiding while already Hiding

UnicordDev · Dec 3, 2024 · 9fab5b8 · 9fab5b8
1 parent b5fdbd3
commit 9fab5b8
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/UniSky/Controls/Sheet/SheetRootControl.xaml.cs b/UniSky/Controls/Sheet/SheetRootControl.xaml.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp.UI;
@@ -52,6 +53,8 @@ public double TotalHeight
         public static readonly DependencyProperty TotalHeightProperty =
             DependencyProperty.Register("TotalHeight", typeof(double), typeof(SheetRootControl), new PropertyMetadata(0.0));
 
+        private SemaphoreSlim _hideSemaphore = new SemaphoreSlim(1, 1);
+
         public SheetRootControl()
         {
             this.InitializeComponent();
@@ -98,22 +101,32 @@ private async void OnBackRequested(object sender, BackRequestedEventArgs e)
 
         internal async Task<bool> HideSheetAsync()
         {
-            // TODO: allow deferrals
-            if (SheetRoot.Child is SheetControl control)
+            if (!await _hideSemaphore.WaitAsync(100))
+                return false;
+
+            try
             {
-                if (!await control.InvokeHidingAsync())
-                    return false;
-            }
+                // TODO: allow deferrals
+                if (SheetRoot.Child is SheetControl control)
+                {
+                    if (!await control.InvokeHidingAsync())
+                        return false;
+                }
 
-            VisualStateManager.GoToState(this, "Closed", true);
+                VisualStateManager.GoToState(this, "Closed", true);
 
-            var safeAreaService = Ioc.Default.GetRequiredService<ISafeAreaService>();
-            safeAreaService.SafeAreaUpdated -= OnSafeAreaUpdated;
+                var safeAreaService = Ioc.Default.GetRequiredService<ISafeAreaService>();
+                safeAreaService.SafeAreaUpdated -= OnSafeAreaUpdated;
 
-            var systemNavigationManager = SystemNavigationManager.GetForCurrentView();
-            systemNavigationManager.BackRequested -= OnBackRequested;
+                var systemNavigationManager = SystemNavigationManager.GetForCurrentView();
+                systemNavigationManager.BackRequested -= OnBackRequested;
 
-            return true;
+                return true;
+            }
+            finally
+            {
+                _hideSemaphore.Release();
+            }
         }
 
         private void OnSafeAreaUpdated(object sender, SafeAreaUpdatedEventArgs e)