be more verbose when locking the mutex fails (cherry picked from commit 4a14a050c4be0...

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 2163da7..ab71981 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2977,7 +2977,10 @@ _dbus_daemon_init(const char *host, dbus_uint32_t port)
   // before _dbus_global_lock to keep correct lock/release order
   hDBusDaemonMutex = CreateMutex( NULL, FALSE, szDBusDaemonMutex );
   ret = WaitForSingleObject( hDBusDaemonMutex, 1000 );
-  _dbus_assert(ret == WAIT_OBJECT_0);
+  if ( ret != WAIT_OBJECT_0 ) {
+    _dbus_warn("Could not lock mutex %s (return code %d). daemon already running?\n", szDBusDaemonMutex, ret );
+    _dbus_assert( !"Could not lock mutex, daemon already running?" );
+  }
 
   // sync _dbus_daemon_init, _dbus_daemon_uninit and _dbus_daemon_already_runs
   lock = _dbus_global_lock( cUniqueDBusInitMutex );