From 763c53c2c78ced844f18cbf433208697b7372cb1 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Fri, 17 Mar 2023 22:07:32 +0300 Subject: [PATCH] Allow sync wait for non-UI threads --- src/Avalonia.Base/Threading/DispatcherOperation.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Avalonia.Base/Threading/DispatcherOperation.cs b/src/Avalonia.Base/Threading/DispatcherOperation.cs index b0d7e5a049..173ab81ef8 100644 --- a/src/Avalonia.Base/Threading/DispatcherOperation.cs +++ b/src/Avalonia.Base/Threading/DispatcherOperation.cs @@ -253,10 +253,9 @@ public class DispatcherOperation : DispatcherOperation { get { - if (TaskCompletionSource.Task.IsCompleted) + if (TaskCompletionSource.Task.IsCompleted || !Dispatcher.CheckAccess()) return TaskCompletionSource.Task.GetAwaiter().GetResult(); throw new InvalidOperationException("Synchronous wait is only supported on non-UI threads"); - } } } @@ -306,4 +305,4 @@ public enum DispatcherOperationStatus Aborted = 1, Completed = 2, Executing = 3, -} \ No newline at end of file +}