From 1f89ebb86adba513433bf08038bb5641f574732c Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Wed, 14 Oct 2020 14:35:19 +0200 Subject: [PATCH] station: Fix .Scanning being reset early periodic_scan_stop is called whenever we exit the autoscan state but a periodic scan may not be running at the time. If we have a user-triggered scan running, or the autoconnect_quick scan, and we reset Scanning to false before that scan finished, a client could en up calling GetOrderedNetwork too early and not receiving the scan results. --- src/station.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/station.c b/src/station.c index ad2c83a6..eb254bf6 100644 --- a/src/station.c +++ b/src/station.c @@ -1031,9 +1031,8 @@ static void periodic_scan_stop(struct station *station) { uint64_t id = netdev_get_wdev_id(station->netdev); - scan_periodic_stop(id); - - station_property_set_scanning(station, false); + if (scan_periodic_stop(id)) + station_property_set_scanning(station, false); } static bool station_needs_hidden_network_scan(struct station *station)