From c196a6eadab591eadb1e981641e06b71f828ba43 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 14 Oct 2012 13:37:59 -0400 Subject: search-engine-simple: don't send last batch when cancelled There's no need to send a last batch of results if we are returning because of a cancellation. --- libnautilus-private/nautilus-search-engine-simple.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c index 453ff1295..dc6ed8ad0 100644 --- a/libnautilus-private/nautilus-search-engine-simple.c +++ b/libnautilus-private/nautilus-search-engine-simple.c @@ -318,7 +318,10 @@ search_thread_func (gpointer user_data) visit_directory (dir, data); g_object_unref (dir); } - send_batch (data); + + if (!g_cancellable_is_cancelled (data->cancellable)) { + send_batch (data); + } g_idle_add (search_thread_done_idle, data); -- cgit v1.2.1