From: Juerg Billeter <j@bitron.ch>
Date: Tue, 4 Dec 2007 10:32:32 +0000 (+0000)
Subject: don't call replace_type when type resolving failed
X-Git-Tag: VALA_0_1_6~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=162a635d212331d8db9f7371de968bd9f2598bf2;p=thirdparty%2Fvala.git

don't call replace_type when type resolving failed

2007-12-04  Juerg Billeter  <j@bitron.ch>

	* vala/valasymbolresolver.vala: don't call replace_type when type
	  resolving failed

svn path=/trunk/; revision=752
---

diff --git a/ChangeLog b/ChangeLog
index 89aad70b9..d1d353ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valasymbolresolver.vala: don't call replace_type when type
+	  resolving failed
+
 2007-12-03  Roberto Majadas  <telemaco@openshine.com>
 
 	* vapi/libgnome-menu.* : Added libgnome-menu vapi files
diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala
index c183c1a6e..590eba8cb 100644
--- a/vala/valasymbolresolver.vala
+++ b/vala/valasymbolresolver.vala
@@ -315,7 +315,9 @@ public class Vala.SymbolResolver : CodeVisitor {
 		var unresolved_type = (UnresolvedType) data_type;
 
 		var type = resolve_type (unresolved_type);
-		unresolved_type.parent_node.replace_type (unresolved_type, type);
+		if (type != null) {
+			unresolved_type.parent_node.replace_type (unresolved_type, type);
+		}
 	}
 
 	public override void visit_variable_declarator (VariableDeclarator! decl) {