Call MenuCommandService.AddCommand on Main thread

Calling on background thread can cause deadlock.
github · Mar 6, 2018 · a087725 · a087725
1 parent 804f3b3
commit a087725
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using GitHub.Api;
 using GitHub.Extensions;
+using GitHub.Helpers;
 using GitHub.Info;
 using GitHub.Logging;
 using GitHub.Models;
@@ -76,6 +77,9 @@ async Task InitializeMenus()
                 return;
             }
 
+            // IMenuCommandService.AddCommand uses IServiceProvider.GetService and must be called on Main thread.
+            await ThreadingHelper.SwitchToMainThreadAsync();
+
             foreach (var menu in menus.Menus)
                 serviceProvider.AddCommandHandler(menu.Guid, menu.CmdId, (s, e) => menu.Activate());