Browse Source

check access before clearing job queue.

pull/10552/head
Dan Walmsley 3 years ago
parent
commit
2b076322e5
  1. 5
      tests/Avalonia.RenderTests/TestBase.cs
  2. 6
      tests/Avalonia.UnitTests/TestWithServicesBase.cs
  3. 6
      tests/Avalonia.UnitTests/UnitTestApplication.cs

5
tests/Avalonia.RenderTests/TestBase.cs

@ -285,7 +285,10 @@ namespace Avalonia.Direct2D1.RenderTests
public void Dispose() public void Dispose()
{ {
Dispatcher.UIThread.RunJobs(); if (Dispatcher.UIThread.CheckAccess())
{
Dispatcher.UIThread.RunJobs();
}
} }
} }
} }

6
tests/Avalonia.UnitTests/TestWithServicesBase.cs

@ -18,7 +18,11 @@ namespace Avalonia.UnitTests
public void Dispose() public void Dispose()
{ {
Dispatcher.UIThread.RunJobs(); if (Dispatcher.UIThread.CheckAccess())
{
Dispatcher.UIThread.RunJobs();
}
_scope.Dispose(); _scope.Dispose();
} }
} }

6
tests/Avalonia.UnitTests/UnitTestApplication.cs

@ -46,7 +46,11 @@ namespace Avalonia.UnitTests
Dispatcher.UIThread.UpdateServices(); Dispatcher.UIThread.UpdateServices();
return Disposable.Create(() => return Disposable.Create(() =>
{ {
Dispatcher.UIThread.RunJobs(); if (Dispatcher.UIThread.CheckAccess())
{
Dispatcher.UIThread.RunJobs();
}
scope.Dispose(); scope.Dispose();
Dispatcher.UIThread.UpdateServices(); Dispatcher.UIThread.UpdateServices();
}); });

Loading…
Cancel
Save