Fix: Fixed InvalidOperationException in SafetyExtensions.IgnoreExceptions

src/Files.App/Extensions/DispatcherQueueExtensions.cs

@@ -13,9 +13,19 @@ public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Func<T
 			return SafetyExtensions.IgnoreExceptions(() =>
 			{
 				if (dispatcher is not null)
-					return dispatcher.EnqueueAsync(function, priority);
-				else
-					return function();
+				{
+					try
+					{
+						return dispatcher.EnqueueAsync(function, priority);
+					}
+					catch (InvalidOperationException ex)
+					{
+						if (ex.Message is not "Failed to enqueue the operation")
+							throw;
+					}
+				}
+
+				return function();
 			}, App.Logger, typeof(COMException));
 		}
 
@@ -24,9 +34,19 @@ public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Func<T
 			return SafetyExtensions.IgnoreExceptions(() =>
 			{
 				if (dispatcher is not null)
-					return dispatcher.EnqueueAsync(function, priority);
-				else
-					return function();
+				{
+					try
+					{
+						return dispatcher.EnqueueAsync(function, priority);
+					}
+					catch (InvalidOperationException ex)
+					{
+						if (ex.Message is not "Failed to enqueue the operation")
+							throw;
+					}
+				}
+
+				return function();
 			}, App.Logger, typeof(COMException));
 		}
 
@@ -35,12 +55,20 @@ public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Action
 			return SafetyExtensions.IgnoreExceptions(() =>
 			{
 				if (dispatcher is not null)
-					return dispatcher.EnqueueAsync(function, priority);
-				else
 				{
-					function();
-					return Task.CompletedTask;
+					try
+					{
+						return dispatcher.EnqueueAsync(function, priority);
+					}
+					catch (InvalidOperationException ex)
+					{
+						if (ex.Message is not "Failed to enqueue the operation")
+							throw;
+					}
 				}
+
+				function();
+				return Task.CompletedTask;
 			}, App.Logger, typeof(COMException));
 		}
 
@@ -49,9 +77,19 @@ public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Action
 			return SafetyExtensions.IgnoreExceptions(() =>
 			{
 				if (dispatcher is not null)
-					return dispatcher.EnqueueAsync(function, priority);
-				else
-					return Task.FromResult(function());
+				{
+					try
+					{
+						return dispatcher.EnqueueAsync(function, priority);
+					}
+					catch (InvalidOperationException ex)
+					{
+						if (ex.Message is not "Failed to enqueue the operation")
+							throw;
+					}
+				}
+
+				return Task.FromResult(function());
 			}, App.Logger, typeof(COMException));
 		}