From 48cd630295b689720a564ab8a03c0473930c63d6 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 12 Mar 2008 14:34:13 +0000 Subject: headset_config_init should be called even if HFP isn't enabled (e.g. to get the SCORouting setting) --- audio/manager.c | 4 ++-- 1 file 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; -- cgit