diff options
Diffstat (limited to 'src/dbus.c')
| -rw-r--r-- | src/dbus.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/dbus.c b/src/dbus.c index 6660cf0c5a..576f7850b2 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -496,12 +496,13 @@ unsigned bus_dispatch(Manager *m) { * dispatch any D-Bus messages, so that we won't end * up wanting to queue another message. */ - if (m->api_bus) - if (!dbus_connection_send(m->api_bus, m->queued_message, NULL)) + if (m->queued_message_connection) + if (!dbus_connection_send(m->queued_message_connection, m->queued_message, NULL)) return 0; dbus_message_unref(m->queued_message); m->queued_message = NULL; + m->queued_message_connection = NULL; } if ((c = set_first(m->bus_connections_for_dispatch))) { @@ -991,6 +992,15 @@ static void shutdown_connection(Manager *m, DBusConnection *c) { set_free(s); } + if (m->queued_message_connection == c) { + m->queued_message_connection = NULL; + + if (m->queued_message) { + dbus_message_unref(m->queued_message); + m->queued_message = NULL; + } + } + dbus_connection_set_dispatch_status_function(c, NULL, NULL, NULL); dbus_connection_flush(c); dbus_connection_close(c); |