Browse Source

Fixed threading

pull/2978/head
Nikita Tsukanov 7 years ago
parent
commit
2e643d65a9
  1. 6
      src/Avalonia.Controls/AppBuilderBase.cs
  2. 3
      src/Avalonia.FreeDesktop/DBusHelper.cs

6
src/Avalonia.Controls/AppBuilderBase.cs

@ -287,12 +287,12 @@ namespace Avalonia.Controls
s_setupWasAlreadyCalled = true; s_setupWasAlreadyCalled = true;
_optionsInitializers?.Invoke(); _optionsInitializers?.Invoke();
RuntimePlatformServicesInitializer(); RuntimePlatformServicesInitializer();
Instance = _appFactory();
Instance.ApplicationLifetime = _lifetime;
AvaloniaLocator.CurrentMutable.BindToSelf(Instance);
WindowingSubsystemInitializer(); WindowingSubsystemInitializer();
RenderingSubsystemInitializer(); RenderingSubsystemInitializer();
AfterPlatformServicesSetupCallback(Self); AfterPlatformServicesSetupCallback(Self);
Instance = _appFactory();
Instance.ApplicationLifetime = _lifetime;
AvaloniaLocator.CurrentMutable.BindToSelf(Instance);
Instance.RegisterServices(); Instance.RegisterServices();
Instance.Initialize(); Instance.Initialize();
AfterSetupCallback(Self); AfterSetupCallback(Self);

3
src/Avalonia.FreeDesktop/DBusHelper.cs

@ -50,9 +50,6 @@ namespace Avalonia.FreeDesktop
public static Exception TryInitialize(string dbusAddress = null) public static Exception TryInitialize(string dbusAddress = null)
{ {
Dispatcher.UIThread.VerifyAccess();
AvaloniaSynchronizationContext.InstallIfNeeded();
var oldContext = SynchronizationContext.Current; var oldContext = SynchronizationContext.Current;
try try
{ {

Loading…
Cancel
Save