From b963e668556299bdef30a693b16c5eb20620db31 Mon Sep 17 00:00:00 2001 From: therzok Date: Tue, 26 Nov 2019 18:26:17 +0200 Subject: [Ide] Load AddinManager data on the UI thread. We need to run this on the UI thread since AddinManager is not thread safe. Invoking extension changed handlers on non-UI thread can lead to weird results Fixes VSTS #1027414 - [FATAL] SigTerm signal in Mono.Addins.dll!Mono.Addins.RuntimeAddin::LoadModule+82" --- .../MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs index ef092bf165..502c2a4020 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs @@ -124,7 +124,7 @@ namespace MonoDevelop.Ide.Composition var fullTimer = System.Diagnostics.Stopwatch.StartNew (); var stepTimer = System.Diagnostics.Stopwatch.StartNew (); - var mefAssemblies = ReadAssembliesFromAddins (timer); + var mefAssemblies = await Runtime.RunInMainThread (() => ReadAssembliesFromAddins (timer)); timings ["ReadFromAddins"] = stepTimer.ElapsedMilliseconds; stepTimer.Restart (); -- cgit v1.2.3