From: Jürg Billeter <j@bitron.ch>
Date: Thu, 18 Dec 2008 13:57:01 +0000 (+0000)
Subject: Fix error propagation in creation methods, fixes part of 564944
X-Git-Tag: VALA_0_5_4~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b944ba0fb777d0db48dbdaeccecf9687fac32c06;p=thirdparty%2Fvala.git

Fix error propagation in creation methods, fixes part of 564944

2008-12-18  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodemethodmodule.vala:

	Fix error propagation in creation methods, fixes part of 564944

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

diff --git a/ChangeLog b/ChangeLog
index a7fb5ab55..68761408b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-18  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodemethodmodule.vala:
+
+	Fix error propagation in creation methods, fixes part of 564944
+
 2008-12-18  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valaccodecontrolflowmodule.vala:
diff --git a/gobject/valaccodemethodmodule.vala b/gobject/valaccodemethodmodule.vala
index b44c6e5b7..1ee88e000 100644
--- a/gobject/valaccodemethodmodule.vala
+++ b/gobject/valaccodemethodmodule.vala
@@ -79,8 +79,6 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 
 		check_type (m.return_type);
 
-		var creturn_type = current_return_type;
-
 		if (m is CreationMethod) {
 			in_creation_method = true;
 			var cl = current_type_symbol as Class;
@@ -94,10 +92,12 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 			}
 
 			if (cl != null) {
-				creturn_type = new ObjectType (cl);
+				current_return_type = new ObjectType (cl);
 			}
 		}
 
+		var creturn_type = current_return_type;
+
 		m.accept_children (codegen);
 
 		if (m is CreationMethod) {