From ec2673d37d841fa0a2c1ebacccdc3eb3fa7ae574 Mon Sep 17 00:00:00 2001 From: Vsevolod Kukol Date: Fri, 9 Aug 2019 19:53:04 +0200 Subject: [Ide] Invoke all WelcomePageService events on UI thread --- .../WelcomePageService.cs | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'main') diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs index 070a53e7ae..7d59ecb6e6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs @@ -116,13 +116,15 @@ namespace MonoDevelop.Ide.WelcomePage public static async void HideWelcomePageOrWindow () { - if (WelcomeWindowProvider != null) { - await Runtime.RunInMainThread (WelcomeWindowProvider.HideWindow); - WelcomeWindowHidden?.Invoke (WelcomeWindow, EventArgs.Empty); - } else { - await Runtime.RunInMainThread (() => HideWelcomePage (true)); - } - visible = false; + await Runtime.RunInMainThread (async () => { + if (WelcomeWindowProvider != null) { + await WelcomeWindowProvider.HideWindow (); + visible = false; + WelcomeWindowHidden?.Invoke (WelcomeWindow, EventArgs.Empty); + } else { + HideWelcomePage (true); + } + }); } public static void ShowWelcomePage (bool animate = false) @@ -166,10 +168,11 @@ namespace MonoDevelop.Ide.WelcomePage return false; } - await Runtime.RunInMainThread (() => WelcomeWindowProvider.ShowWindow (options)); - visible = true; - - WelcomeWindowShown?.Invoke (WelcomeWindow, EventArgs.Empty); + await Runtime.RunInMainThread (async () => { + await WelcomeWindowProvider.ShowWindow (options); + visible = true; + WelcomeWindowShown?.Invoke (WelcomeWindow, EventArgs.Empty); + }); return true; } -- cgit v1.2.3