From 2e643d65a99997103f04400a60959dcb1c113b91 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 11 Sep 2019 23:06:03 +0300
Subject: [PATCH] Fixed threading

---
 src/Avalonia.Controls/AppBuilderBase.cs | 6 +++---
 src/Avalonia.FreeDesktop/DBusHelper.cs  | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 2f796376ea..d9be9171ed 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -287,12 +287,12 @@ namespace Avalonia.Controls
             s_setupWasAlreadyCalled = true;
             _optionsInitializers?.Invoke();
             RuntimePlatformServicesInitializer();
-            Instance = _appFactory();
-            Instance.ApplicationLifetime = _lifetime;
-            AvaloniaLocator.CurrentMutable.BindToSelf(Instance);
             WindowingSubsystemInitializer();
             RenderingSubsystemInitializer();
             AfterPlatformServicesSetupCallback(Self);
+            Instance = _appFactory();
+            Instance.ApplicationLifetime = _lifetime;
+            AvaloniaLocator.CurrentMutable.BindToSelf(Instance);
             Instance.RegisterServices();
             Instance.Initialize();
             AfterSetupCallback(Self);
diff --git a/src/Avalonia.FreeDesktop/DBusHelper.cs b/src/Avalonia.FreeDesktop/DBusHelper.cs
index 509e312e1b..b445f86613 100644
--- a/src/Avalonia.FreeDesktop/DBusHelper.cs
+++ b/src/Avalonia.FreeDesktop/DBusHelper.cs
@@ -50,9 +50,6 @@ namespace Avalonia.FreeDesktop
 
         public static Exception TryInitialize(string dbusAddress = null)
         {
-
-            Dispatcher.UIThread.VerifyAccess();
-            AvaloniaSynchronizationContext.InstallIfNeeded();
             var oldContext = SynchronizationContext.Current;
             try
             {