diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2017-04-24 15:29:45 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2017-04-24 15:29:45 +0300 |
| commit | 487701dcf149139471aac23a09110cc7fc5bb47e (patch) | |
| tree | da29f7041bdcc51d3d6e62c607f8d71c63a63a15 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui | |
| parent | 503510ecb348ac8138fad566b1241134f8a398e3 (diff) | |
| parent | 5c4c02e4bbd471fd84d1d4626ebcbe136e7364ef (diff) | |
Merge branch 'd15-2'
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs index 5b3c3ad055..56a279143d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs @@ -178,8 +178,9 @@ namespace MonoDevelop.Ide.Gui void TypeSystemService_WorkspaceItemLoaded (object sender, EventArgs e) { + if (IsAdHocProject) + return; UnsubscribeAnalysisDocument (); - UnloadAdhocProject (); EnsureAnalysisDocumentIsOpen ().ContinueWith (delegate { if (analysisDocument != null) StartReparseThread (); @@ -845,8 +846,6 @@ namespace MonoDevelop.Ide.Gui if (Project != null && !IsUnreferencedSharedProject(Project)) { UnsubscribeRoslynWorkspace (); RoslynWorkspace = TypeSystemService.GetWorkspace (this.Project.ParentSolution); - if (RoslynWorkspace == null) // Solution not loaded yet - return Task.CompletedTask; SubscribeRoslynWorkspace (); analysisDocument = FileName != null ? TypeSystemService.GetDocumentId (this.Project, this.FileName) : null; if (analysisDocument != null) { |