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.

diff --git a/ChangeLog b/ChangeLog
index edcac70e140ab9ff601e088f9c6eebbfe94e1814..a77fcd413e138b4b96f3a065dbcc88a4df78127f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 34e55873147befe8a5a46770ee3777d1dcd96fe2..c9c09dfb89e1d56b9d2a894f5806c9c90b091ba3 100644 (file)
--- 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");