summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2008-03-12 14:34:13 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2008-03-12 14:34:13 +0000
commit48cd630295b689720a564ab8a03c0473930c63d6 (patch)
treef532cc376ac84ad45e67fc6dccab97219a375bf1 /audio
parentfb9cc5a68f4d046b88e3bc065c680b5e35202550 (diff)
headset_config_init should be called even if HFP isn't enabled (e.g. to get the SCORouting setting)
Diffstat (limited to 'audio')
-rw-r--r--audio/manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/manager.c b/audio/manager.c
index c0f4ffd1..4abc4571 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -1594,6 +1594,8 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config)
g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
(GIOFunc) ag_io_cb, NULL);
+ features = headset_config_init(config);
+
if (!hfp)
return 0;
@@ -1603,8 +1605,6 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config)
if (!hf_server)
return -1;
- features = headset_config_init(config);
-
if (hfp_ag_record(&buf, chan, features) < 0) {
error("Unable to allocate new service record");
return -1;