2004-03-08 Michael Meeks <michael@ximian.com>

* dbus/dbus-connection.c (_dbus_connection_block_for_reply):
	bail immediately if disconnected, to avoid busy loop.
This commit is contained in:
Michael Meeks 2004-03-08 10:59:20 +00:00
parent 9d633977d1
commit 387510da64
2 changed files with 6 additions and 1 deletions

View file

@ -1,5 +1,8 @@
2004-03-08 Michael Meeks <michael@ximian.com>
* dbus/dbus-connection.c (_dbus_connection_block_for_reply):
bail immediately if disconnected, to avoid busy loop.
* dbus/dbus-message.c (dbus_message_iter_get_args_valist):
cleanup cut/paste/inefficiency.

View file

@ -1915,7 +1915,9 @@ _dbus_connection_block_for_reply (DBusConnection *connection,
_dbus_get_current_time (&tv_sec, &tv_usec);
if (tv_sec < start_tv_sec)
if (!_dbus_connection_get_is_connected_unlocked (connection))
return NULL;
else if (tv_sec < start_tv_sec)
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
else if (connection->disconnect_message_link == NULL)
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): disconnected\n");