From: Jürg Billeter <j@bitron.ch>
Date: Wed, 16 Sep 2009 16:31:27 +0000 (+0200)
Subject: D-Bus: Fix return statement in error handling of async server methods
X-Git-Tag: 0.7.6~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f7393917c474ea5e448485f6eccde085627158d;p=thirdparty%2Fvala.git

D-Bus: Fix return statement in error handling of async server methods
---

diff --git a/codegen/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
index c2295a4b7..582cfe800 100644
--- a/codegen/valadbusservermodule.vala
+++ b/codegen/valadbusservermodule.vala
@@ -347,11 +347,12 @@ internal class Vala.DBusServerModule : DBusClientModule {
 			generate_server_error_cases (error_block, m.get_error_types (), new CCodeIdentifier ("error"), new CCodeIdentifier ("message"), new CCodeIdentifier ("reply"));
 
 			send_reply (error_block);
-			error_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("DBUS_HANDLER_RESULT_HANDLED")));
 
 			if (m.coroutine) {
+				error_block.add_statement (new CCodeReturnStatement ());
 				ready_block.add_statement (new CCodeIfStatement (new CCodeIdentifier ("error"), error_block));
 			} else {
+				error_block.add_statement (new CCodeReturnStatement (new CCodeIdentifier ("DBUS_HANDLER_RESULT_HANDLED")));
 				block.add_statement (new CCodeIfStatement (new CCodeIdentifier ("error"), error_block));
 			}
 		}