From 4abafd8eea59de1acf5be07bcbf2d80faa616696 Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Thu, 19 Mar 2020 22:12:13 +0100 Subject: [PATCH] wsc: Don't start connections until Cancel finishes Return busy from StartPin and PushButton if the Cancel method is still running. --- src/wsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wsc.c b/src/wsc.c index 393e8d8d..e9ebe5f5 100644 --- a/src/wsc.c +++ b/src/wsc.c @@ -1111,7 +1111,7 @@ static struct l_dbus_message *wsc_push_button(struct l_dbus *dbus, if (!l_dbus_message_get_arguments(message, "")) return dbus_error_invalid_args(message); - if (wsc->pending_connect) + if (wsc->pending_connect || wsc->pending_cancel) return dbus_error_busy(message); wsc->pending_connect = l_dbus_message_ref(message); @@ -1150,7 +1150,7 @@ static struct l_dbus_message *wsc_start_pin(struct l_dbus *dbus, l_debug(""); - if (wsc->pending_connect) + if (wsc->pending_connect || wsc->pending_cancel) return dbus_error_busy(message); if (!l_dbus_message_get_arguments(message, "s", &pin))