Merge pull request #5046 from mono/fix-null-ref-on-opening-sdk-project

[Core] Fix null reference when opening SDK style project
mono · Jun 12, 2018 · 34fcedc · 34fcedc
2 parents 3b9a2c6 + b5c8a5b
commit 34fcedc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectInstance.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectInstance.cs
@@ -234,12 +234,20 @@ internal ConditionedPropertyCollection GetConditionedProperties ()
 
 		public IEnumerable<MSBuildItem> FindGlobItemsIncludingFile (string include)
 		{
-			return engine?.FindGlobItemsIncludingFile (projectInstance, include);
+			var currentEngine = engine;
+			var currentProjectInstance = projectInstance;
+			if (currentEngine == null || currentProjectInstance == null)
+				return null;
+			return currentEngine.FindGlobItemsIncludingFile (currentProjectInstance, include);
 		}
 
 		internal IEnumerable<MSBuildItem> FindUpdateGlobItemsIncludingFile (string include, MSBuildItem globItem)
 		{
-			return engine?.FindUpdateGlobItemsIncludingFile (projectInstance, include, globItem);
+			var currentEngine = engine;
+			var currentProjectInstance = projectInstance;
+			if (currentEngine == null || currentProjectInstance == null)
+				return null;
+			return currentEngine.FindUpdateGlobItemsIncludingFile (currentProjectInstance, include, globItem);
 		}
 
 		/// <summary>