codegen: Only add _error path if there's parameters that require unref

Fixes the _error label from being set at the end of a compound statement
if there are no values to unref.

https://bugzilla.gnome.org/show_bug.cgi?id=778540

diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala
index 4f06210f7932110fbcdc6aeeb6d4edd2954a29f5..2cb42710ed2f842e505bece6e0051735ac32f0e9 100644 (file)
--- a/codegen/valagdbusservermodule.vala
+++ b/codegen/valagdbusservermodule.vala
@@ -145,8 +145,12 @@ public class Vala.GDBusServerModule : GDBusClientModule {
                                        return_error.add_argument (new CCodeIdentifier ("error"));
                                        ccode.add_expression (return_error);
 
-                                       ccode.add_goto ("_error");
-                                       need_goto_label = true;
+                                       if (need_goto_label || requires_destroy (owned_type)) {
+                                               ccode.add_goto ("_error");
+                                               need_goto_label = true;
+                                       } else {
+                                               ccode.add_return ();
+                                       }
 
                                        ccode.close ();
                                }