From 2d46880b726baeeb53a817d0b044a77fa36851b2 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Fri, 25 Sep 2009 19:28:27 +0000
Subject: [PATCH] Fixed ambience NullReferenceException (bug introduced in
 revision 4954)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4993 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/Src/CSharp/CSharpAmbience.cs                        | 2 ++
 .../Project/Src/VBNet/VBNetAmbience.cs                          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs
index 8b6c30ab79..d295c7f050 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/CSharp/CSharpAmbience.cs
@@ -534,6 +534,8 @@ namespace ICSharpCode.SharpDevelop.Dom.CSharp
 		
 		static IReturnType GetElementType(IReturnType potentialArrayType)
 		{
+			if (potentialArrayType == null)
+				return null;
 			ArrayReturnType result;
 			while ((result = potentialArrayType.CastToArrayReturnType()) != null) {
 				potentialArrayType = result.ArrayElementType;
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs
index b5502c139d..0fc70994e9 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetAmbience.cs
@@ -552,6 +552,8 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet
 		
 		static IReturnType GetElementType(IReturnType potentialArrayType)
 		{
+			if (potentialArrayType == null)
+				return null;
 			ArrayReturnType result;
 			while ((result = potentialArrayType.CastToArrayReturnType()) != null) {
 				potentialArrayType = result.ArrayElementType;