korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 05:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add checks for pending connect to sco_connect_cb

Browse Source
This commit is contained in:
Johan Hedberg 2009-02-26 00:03:10 +02:00
parent 118aad5072
commit 5fa1445615
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/headset.c
View File

@ -523,10 +523,11 @@ static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
if (err) {
error("%s", err->message);
if (p->msg)
if (p && p->msg)
error_connection_attempt_failed(dev->conn, p->msg, p->err);
pending_connect_finalize(dev);
if (hs->rfcomm)
headset_set_state(dev, HEADSET_STATE_CONNECTED);
else
@ -541,15 +542,18 @@ static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
debug("SCO fd=%d", sk);
hs->sco = g_io_channel_ref(chan);
p->io = NULL;
if (p->msg) {
DBusMessage *reply = dbus_message_new_method_return(p->msg);
g_dbus_send_message(dev->conn, reply);
if (p) {
p->io = NULL;
if (p->msg) {
DBusMessage *reply;
reply = dbus_message_new_method_return(p->msg);
g_dbus_send_message(dev->conn, reply);
}
pending_connect_finalize(dev);
}
pending_connect_finalize(dev);
fcntl(sk, F_SETFL, 0);
headset_set_state(dev, HEADSET_STATE_PLAYING);