diff options
| author | Marc-André Lureau <marc-andre.lureau@nokia.com> | 2009-05-12 01:39:55 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-05-12 01:33:37 +0200 |
| commit | 86caf4520fe3ffb899110711ff0d8a8b8122368e (patch) | |
| tree | 62e0c045de58f17b3269a1cdd6f525f8cfa859af /src/pulse | |
| parent | 4c3aef367ba344eccdab5f7f25ec656816c78403 (diff) | |
context: don't fail if session bus is not there
Also invert the order of bus tracking since we expect session_bus to
be present when we check for it. Although that should not change
anything in practise.
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index bfff0e17..3b7bf08d 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -811,10 +811,10 @@ static int try_next_connection(pa_context *c) { #ifdef HAVE_DBUS if (c->no_fail && !c->server_specified) { - if (!c->system_bus) - track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus); if (!c->session_bus) track_pulseaudio_on_dbus(c, DBUS_BUS_SESSION, &c->session_bus); + if (!c->system_bus) + track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus); } else #endif pa_context_fail(c, PA_ERR_CONNECTIONREFUSED); @@ -892,7 +892,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo /* FIXME: We probably should check if this is actually the NameOwnerChanged we were looking for */ - is_session = bus == pa_dbus_wrap_connection_get(c->session_bus); + is_session = c->session_bus && bus == pa_dbus_wrap_connection_get(c->session_bus); pa_log_debug("Rock!! PulseAudio is back on %s bus", is_session ? "session" : "system"); if (is_session) |