summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-08-16 22:05:55 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-08-16 22:05:55 +0000
commit2c0e2fcf82a062558526ae164796855b584603f0 (patch)
tree15daf54e9162e60ad29764412b4a069734512233 /audio
parentbcd8170e936963a81df3115558bf4a16962dc70b (diff)
Fix path (un)registering when hcid is not running
Diffstat (limited to 'audio')
-rw-r--r--audio/manager.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/audio/manager.c b/audio/manager.c
index 231af376..20b91435 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -1670,18 +1670,18 @@ int audio_init(DBusConnection *conn, struct enabled_interfaces *enable,
enabled = enable;
- if (headset_server_init(conn, no_hfp) < 0)
- goto failed;
-
- if (a2dp_init(conn, enable->sink, enable->source) < 0)
- goto failed;
-
if (!dbus_connection_create_object_path(conn, AUDIO_MANAGER_PATH,
NULL, manager_unregister)) {
error("D-Bus failed to register %s path", AUDIO_MANAGER_PATH);
goto failed;
}
+ if (headset_server_init(conn, no_hfp) < 0)
+ goto failed;
+
+ if (a2dp_init(conn, enable->sink, enable->source) < 0)
+ goto failed;
+
if (!dbus_connection_register_interface(conn, AUDIO_MANAGER_PATH,
AUDIO_MANAGER_INTERFACE,
manager_methods,