summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-10-14 13:37:59 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2012-10-15 09:51:32 -0400
commitc196a6eadab591eadb1e981641e06b71f828ba43 (patch)
tree6d42f914dd92b7bcef5ebf3f01545dd0914d3149
parentcbd5212e3984859682ceafa8b1c8f874d644cc78 (diff)
downloadnautilus-c196a6eadab591eadb1e981641e06b71f828ba43.tar.gz
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.
-rw-r--r--libnautilus-private/nautilus-search-engine-simple.c5
1 files changed, 4 insertions, 1 deletions
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);