diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-12-02 17:52:04 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-12-03 11:54:19 +0300 |
| commit | 7c8c694098ea21e7bc7d4f15321312f21536dce9 (patch) | |
| tree | 4f138fdcb3a4a0e1419e6b9b0d3008776a87b71d /main | |
| parent | 6429157bc3abf09796c4d6efc8f1ef8282e3a09f (diff) | |
Add back accidentally removed check
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 2cc3ca4b88..cc9706699b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Composition/CompositionManager.cs @@ -60,7 +60,7 @@ namespace MonoDevelop.Ide.Composition get {
if (instance == null) {
var task = Runtime.GetService<CompositionManager> ();
- if (!task.IsCompleted) { + if (!task.IsCompleted && Runtime.IsMainThread) { LoggingService.LogWarning ("UI thread queried MEF while it was still being built:{0}{1}", Environment.NewLine, Environment.StackTrace); }
instance = task.WaitAndGetResult ();
|