dbus/dbus dbus-connection.c,1.75,1.76

[Michael Meeks]

Update of /cvs/dbus/dbus/dbus
In directory pdx:/tmp/cvs-serv27634/dbus

Modified Files:
	dbus-connection.c 
Log Message:
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.



Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- a/dbus-connection.c	2 Dec 2003 10:44:21 -0000	1.75
+++ b/dbus-connection.c	8 Mar 2004 10:59:20 -0000	1.76
@@ -1915,7 +1915,9 @@
   
   _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");