diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-05-18 14:03:01 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-05-18 14:03:01 +0300 |
| commit | 4214291e0d34ff8f67184bf2257dea2a4275751e (patch) | |
| tree | 63f79d2e84e740e670ce8bdb0d03f5e79d0779ab /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates | |
| parent | cb06380f084c094a93454a27db7bcdfebc4c7042 (diff) | |
| parent | b8d0e0ac4df2739a82445d3fabf918e1eda10881 (diff) | |
Merge branch 'master' into dotnetcore2
Conflicts:
main/src/addins/MonoDevelop.DotNetCore/Properties/MonoDevelop.DotNetCore.addin.xml
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs index 9c4fd4c535..be573a8cc8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs @@ -228,7 +228,7 @@ namespace MonoDevelop.Ide.Templates var list = new List<FileTemplate> (); foreach (var node in extensionContext.GetExtensionNodes<ProjectTemplateCodon> (EXTENSION_PATH)) { var template = LoadTemplate (node); - if (template.IsValidForProject (project, projectPath)) { + if (template != null && template.IsValidForProject (project, projectPath)) { list.Add (template); } } |