X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils-jbus.c;h=67e3ce4ceac6957a6bdcccb362e8df254d285f24;hb=bf650bc39188c86cec8a11097f2c341e3f1b54b1;hp=70000096a8ea03903f869014ce7d36353c52eeb8;hpb=9eeddada7a5481660ab1547dae89be3b470571e6;p=src%2Fapp-framework-main.git

diff --git a/src/utils-jbus.c b/src/utils-jbus.c
index 7000009..67e3ce4 100644
--- a/src/utils-jbus.c
+++ b/src/utils-jbus.c
@@ -669,6 +669,7 @@ int jbus_dispatch_multiple(struct jbus **jbuses, int njbuses, int maxcount)
 
 	for (i = r = 0 ; i < njbuses && r < maxcount ; i++) {
 		dbus_connection_read_write(jbuses[i]->connection, 0);
+		sts = dbus_connection_get_dispatch_status(jbuses[i]->connection);
 		while(sts == DBUS_DISPATCH_DATA_REMAINS &&  r < maxcount) {
 			sts = dbus_connection_dispatch(jbuses[i]->connection);
 			r++;
@@ -690,6 +691,8 @@ int jbus_read_write_dispatch_multiple(struct jbus **jbuses, int njbuses, int tom
 	assert(fds != NULL);
 
 	r = jbus_dispatch_multiple(jbuses, njbuses, maxcount);
+	if (r)
+		return r;
 	n = jbus_fill_pollfds(jbuses, njbuses, fds);
 	for(;;) {
 		s = poll(fds, n, toms);