Browse Source

Fixed thread-race condition on shutdown (#20299)

release/11.3
Grigorii Vasilchenko 2 months ago
committed by Julien Lebosquain
parent
commit
e0a89fb4d9
  1. 6
      src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs

6
src/Avalonia.Base/Threading/Dispatcher.MainLoop.cs

@ -141,6 +141,8 @@ public partial class Dispatcher
else else
{ {
operation = null; operation = null;
_impl.UpdateTimer(null);
_hasShutdownFinished = true;
} }
} }
@ -150,8 +152,6 @@ public partial class Dispatcher
} }
} while (operation != null); } while (operation != null);
_impl.UpdateTimer(null);
_hasShutdownFinished = true;
ShutdownFinished?.Invoke(this, EventArgs.Empty); ShutdownFinished?.Invoke(this, EventArgs.Empty);
} }
@ -213,4 +213,4 @@ public partial class Dispatcher
return new DispatcherProcessingDisabled(this, oldContext); return new DispatcherProcessingDisabled(this, oldContext);
} }
} }

Loading…
Cancel
Save