From 387510da641d1b91cd5369e292e6203e376da1a2 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 8 Mar 2004 10:59:20 +0000 Subject: 2004-03-08 Michael Meeks * dbus/dbus-connection.c (_dbus_connection_block_for_reply): bail immediately if disconnected, to avoid busy loop. --- dbus/dbus-connection.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-connection.c') diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 34e55873..c9c09dfb 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -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"); -- cgit