Merge

Author: ferrariofilippo

src/Files.App/App.xaml.cs

@@ -2,7 +2,6 @@
 using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Helpers;
 using CommunityToolkit.WinUI.Notifications;
-using Files.App.Controllers;
 using Files.App.DataModels;
 using Files.App.Extensions;
 using Files.App.Filesystem;
@@ -30,6 +29,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppLifecycle;
 using System;
 using System.Diagnostics;
@@ -54,6 +54,7 @@ public partial class App : Application
 		private static bool ShowErrorNotification = false;
 
 		public static string OutputPath { get; set; }
+		public static CommandBarFlyout? LastOpenedFlyout { get; set; }
 		public static StorageHistoryWrapper HistoryWrapper = new StorageHistoryWrapper();
 		public static SettingsViewModel AppSettings { get; private set; }
 		public static AppModel AppModel { get; private set; }
@@ -287,6 +288,15 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 		{
 			// Save application state and stop any background activity
 
+			// A Workaround for the crash (#10110)
+			if (LastOpenedFlyout?.IsOpen ?? false)
+			{
+				args.Handled = true;
+				LastOpenedFlyout.Closed += (sender, e) => App.Current.Exit();
+				LastOpenedFlyout.Hide();
+				return;
+			}
+
 			await Task.Yield(); // Method can take a long time, make sure the window is hidden
 
 			SaveSessionTabs();