diff options
| author | Marius Ungureanu <teromario@yahoo.com> | 2019-04-04 20:13:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 20:13:09 +0300 |
| commit | bb974bf7ba8ed3f329fdd92230dc5eff839e4e1c (patch) | |
| tree | 28f9a1bd10d20a81c9b5c22a75e7ef6f5972057c /main/src | |
| parent | 93f6f7ac3ee31d32793d066430bd0d183a7de8ab (diff) | |
| parent | 2d4f476e1a2d020f0ce3b933764357c810c343fa (diff) | |
Merge pull request #502 from xamarin/master-vnext-cache-failure
[Workspace] Cancellation will make the cacheInfo return null, so hand…
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectSystemHandler.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectSystemHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectSystemHandler.cs index 6e63ff084b..479dbbbc12 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectSystemHandler.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.ProjectSystemHandler.cs @@ -111,6 +111,9 @@ namespace MonoDevelop.Ide.TypeSystem if (cacheInfo == null) { cacheInfo = await LoadProjectCacheInfo (p, config, token).ConfigureAwait (false); + if (token.IsCancellationRequested) + return null; + if (config != null) workspaceCache.Update (config, p, projectMap, cacheInfo); } |