Fix duplicate wireless scan results

1 files changed, 8 insertions, 20 deletions

diff --git a/plugins/wifi.c b/plugins/wifi.c
index e38f2bba..f2153527 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -140,7 +140,7 @@ static struct connman_element *find_current_element(struct wifi_data *data,
 		struct connman_element *element = list->data;
 
 		if (connman_element_match_static_property(element,
-					"Name", &identifier) == TRUE)
+						"Name", &identifier) == TRUE)
 			return element;
 	}
 
@@ -156,7 +156,7 @@ static struct connman_element *find_pending_element(struct wifi_data *data,
 		struct connman_element *element = list->data;
 
 		if (connman_element_match_static_property(element,
-					"Name", &identifier) == TRUE)
+						"Name", &identifier) == TRUE)
 			return element;
 	}
 
@@ -170,11 +170,6 @@ static gboolean inactive_scan(gpointer user_data)
 
 	DBG("");
 
-	if (data->cleanup_timer > 0) {
-		g_source_remove(data->cleanup_timer);
-		data->cleanup_timer = 0;
-	}
-
 	__supplicant_scan(device);
 
 	data->inactive_timer = 0;
@@ -290,12 +285,14 @@ static void clear_results(struct connman_element *device)
 	DBG("pending %d", g_slist_length(data->pending));
 	DBG("current %d", g_slist_length(data->current));
 
+	if (data->cleanup_timer > 0) {
+		g_source_remove(data->cleanup_timer);
+		cleanup_pending(data);
+	}
+
 	data->pending = data->current;
 	data->current = NULL;
 
-	if (data->cleanup_timer > 0)
-		return;
-
 	data->cleanup_timer = g_timeout_add_seconds(CLEANUP_TIMEOUT,
 							cleanup_pending, data);
 }
@@ -457,7 +454,7 @@ static int wifi_disable(struct connman_element *element)
 
 	if (data->cleanup_timer > 0) {
 		g_source_remove(data->cleanup_timer);
-		data->cleanup_timer = 0;
+		cleanup_pending(data);
 	}
 
 	if (data->inactive_timer > 0) {
@@ -467,15 +464,6 @@ static int wifi_disable(struct connman_element *element)
 
 	__supplicant_disconnect(element);
 
-	for (list = data->pending; list; list = list->next) {
-		struct connman_element *network = list->data;
-
-		connman_element_unref(network);
-	}
-
-	g_slist_free(data->pending);
-	data->pending = NULL;
-
 	for (list = data->current; list; list = list->next) {
 		struct connman_element *network = list->data;