| Message ID | 20200608220153.880790-1-luiz.dentz@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [BlueZ,1/3] adapter: Do not remove client watch directly if discovery fails | expand |
Hi, On Mon, Jun 8, 2020 at 3:01 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > Client watch is used for both discovery and it filters so in case the > client has set the later the watch shall be perserved. > --- > src/adapter.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/src/adapter.c b/src/adapter.c > index 76acfea70..bf51b120b 100644 > --- a/src/adapter.c > +++ b/src/adapter.c > @@ -1651,7 +1651,6 @@ fail: > if (client->msg) { > reply = btd_error_busy(client->msg); > g_dbus_send_message(dbus_conn, reply); > - g_dbus_remove_watch(dbus_conn, client->watch); > discovery_remove(client, false); > return; > } > -- > 2.25.3 > Pushed.
diff --git a/src/adapter.c b/src/adapter.c index 76acfea70..bf51b120b 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1651,7 +1651,6 @@ fail: if (client->msg) { reply = btd_error_busy(client->msg); g_dbus_send_message(dbus_conn, reply); - g_dbus_remove_watch(dbus_conn, client->watch); discovery_remove(client, false); return; }
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Client watch is used for both discovery and it filters so in case the client has set the later the watch shall be perserved. --- src/adapter.c | 1 - 1 file changed, 1 deletion(-)