Merge pull request #41461 from mavasani/FixTryApplyChangesCrash

JoeRobich · web-flow · commit b085b72c5b29 · 2020-02-10T16:42:56.000-08:00
Switch to UI thread before invoking Workspace.TryApplyChanges
diff --git a/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs b/src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
@@ -212,7 +212,11 @@ private async Task UpdateStateMachineWorkerAsync(CancellationToken cancellationT
                     break;
             }
 
+            // Apply the new options.
+            // We need to switch to UI thread to invoke TryApplyChanges.
+            await ThreadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
             _workspace.TryApplyChanges(_workspace.CurrentSolution.WithOptions(options));
+
             if (options.GetOption(KeybindingResetOptions.NeedsReset))
             {
                 ShowGoldBar();

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,11 @@ private async Task UpdateStateMachineWorkerAsync(CancellationToken cancellationT`
`212`	`212`	`break;`
`213`	`213`	`}`
`214`	`214`
	`215`	`+ // Apply the new options.`
	`216`	`+ // We need to switch to UI thread to invoke TryApplyChanges.`
	`217`	`+ await ThreadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);`
`215`	`218`	`_workspace.TryApplyChanges(_workspace.CurrentSolution.WithOptions(options));`
	`219`	`+`
`216`	`220`	`if (options.GetOption(KeybindingResetOptions.NeedsReset))`
`217`	`221`	`{`
`218`	`222`	`ShowGoldBar();`