From 7fac18bd153f8d9184a9c5b41af70258aa62b680 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Wed, 22 Apr 2009 12:49:45 +0100 Subject: [PATCH] be more verbose when locking the mutex fails (cherry picked from commit 4a14a050c4be026c7b9d67fd1f47c8479edebfc4) --- dbus/dbus-sysdeps-win.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 2163da7..ab71981 100644 --- 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 ); -- 2.7.4