From 57c3aa25897cf290960acf0dd62ae04b07725999 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 13 Jul 2018 12:30:25 -0500 Subject: [PATCH] scan: Fix triggered flag setting triggered flag was being reset to false in all cases. However, due to how scan_finished logic works, it should have remained true if no more commands were left to be sent (e.g. the scan was finished). --- src/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scan.c b/src/scan.c index 97b1bdc4..efc48f6d 100644 --- a/src/scan.c +++ b/src/scan.c @@ -413,8 +413,10 @@ static int scan_request_send_next(struct scan_context *sc, return -ENOMSG; sc->start_cmd_id = scan_send_start(&cmd, scan_triggered, sc); - if (sc->start_cmd_id) + if (sc->start_cmd_id) { + sr->triggered = false; return 0; + } l_genl_msg_unref(cmd); return -EIO; @@ -1207,8 +1209,6 @@ static bool scan_send_next_cmd(struct scan_context *sc) int err; if (sr && sr->triggered) { - sr->triggered = false; - err = scan_request_send_next(sc, sr); if (!err) return true;