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 a7fb5ab5533ba95fe273112bc79e61f80f7075cd..68761408b06f39f643f8c26a495e0a3fc8b51da0 100644 (file)
--- 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 b44c6e5b717790506531f741275aaeffb30105ed..1ee88e000328edecc59b308d4a61fb404cf1eea7 100644 (file)
--- 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) {