On Thu, Nov 4, 2010 at 8:16 PM, Johan Hedberg <johan.hedberg@xxxxxxxxx> wrote: > This doesn't seem quite right to me. Aren't you now adding a disconnect > callback twice: once for CONNECTING and a second time for CONNECTED? It > seems like you should only add it when new_state == CONNECTING, right? > Yes, that seems right, attaching updated patch. /Daniel
From e42ce63878f368893e5e119d27a5477dd430f9ae Mon Sep 17 00:00:00 2001 From: Daniel Orstadius <daniel.orstadius@xxxxxxxxx> Date: Fri, 5 Nov 2010 10:49:41 +0200 Subject: [PATCH] Fix add disconnect watch in connecting state If disconnect_cb is not added until the connected state, the callback will not be triggered if Device.Disconnected is called while the audio profiles are still connecting. --- audio/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/audio/device.c b/audio/device.c index 9554c7b..eff8231 100644 --- a/audio/device.c +++ b/audio/device.c @@ -231,7 +231,7 @@ static void device_set_state(struct audio_device *dev, audio_state_t new_state) priv->dc_id); priv->dc_id = 0; } - } else if (new_state == AUDIO_STATE_CONNECTED) + } else if (new_state == AUDIO_STATE_CONNECTING) priv->dc_id = device_add_disconnect_watch(dev->btd_dev, disconnect_cb, dev, NULL); -- 1.6.0.4
