From: Christian Dywan <christian.dywan@lanedo.com>
Date: Tue, 21 Sep 2010 12:43:39 +0000 (+0200)
Subject: Always get current time in _dbus_connection_block_pending_call
X-Git-Tag: dbus-1.4.1~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06b0e8a8cb3cc70057e86dec340011731412b133;p=thirdparty%2Fdbus.git

Always get current time in _dbus_connection_block_pending_call
---

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 6f38d141c..fc68b9847 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -2385,10 +2385,10 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
    * below
    */
   timeout = _dbus_pending_call_get_timeout_unlocked (pending);
+  _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
   if (timeout)
     {
       timeout_milliseconds = dbus_timeout_get_interval (timeout);
-      _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
 
       _dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec\n",
                      timeout_milliseconds,