Skip to content

Fix: Fixed COMException in ItemsAdded_CollectionChanged - part 3 #14497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2024
Merged

Fix: Fixed COMException in ItemsAdded_CollectionChanged - part 3 #14497

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions src/Files.App/Extensions/DispatcherQueueExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,49 @@ public static class DispatcherQueueExtensions
{
public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Func<Task> function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return SafetyExtensions.IgnoreExceptions(function, App.Logger, typeof(COMException));
return SafetyExtensions.IgnoreExceptions(() =>
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return function();
}, App.Logger, typeof(COMException));
}

public static Task<T> EnqueueOrInvokeAsync<T>(this DispatcherQueue? dispatcher, Func<Task<T>> function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
public static Task<T?> EnqueueOrInvokeAsync<T>(this DispatcherQueue? dispatcher, Func<Task<T>> function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return SafetyExtensions.IgnoreExceptions(function, App.Logger, typeof(COMException));
return SafetyExtensions.IgnoreExceptions(() =>
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return function();
}, App.Logger, typeof(COMException));
}

public static Task EnqueueOrInvokeAsync(this DispatcherQueue? dispatcher, Action function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return SafetyExtensions.IgnoreExceptions(() =>
{
SafetyExtensions.IgnoreExceptions(function, App.Logger, typeof(COMException));
return Task.CompletedTask;
}
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
{
function();
return Task.CompletedTask;
}
}, App.Logger, typeof(COMException));
}

public static Task<T> EnqueueOrInvokeAsync<T>(this DispatcherQueue? dispatcher, Func<T> function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
public static Task<T?> EnqueueOrInvokeAsync<T>(this DispatcherQueue? dispatcher, Func<T> function, DispatcherQueuePriority priority = DispatcherQueuePriority.Normal)
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return Task.FromResult(SafetyExtensions.IgnoreExceptions(function, App.Logger, typeof(COMException)));
return SafetyExtensions.IgnoreExceptions(() =>
{
if (dispatcher is not null)
return dispatcher.EnqueueAsync(function, priority);
else
return Task.FromResult(function());
}, App.Logger, typeof(COMException));
}

}
Expand Down