From 102efff0c462481afc4a0a1decbd3d112d73bacf Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Sun, 3 May 2020 20:18:03 +0200 Subject: tag-manager: Fix checks for cancellation Only process query results if there's no error. Fix some checks so that we report errors except for G_IO_ERROR_CANCELLED, which happens normally as part of nautilus_application_finalize(). --- src/nautilus-tag-manager.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c index 78c81e0b6..345ddb75b 100644 --- a/src/nautilus-tag-manager.c +++ b/src/nautilus-tag-manager.c @@ -245,8 +245,7 @@ on_update_callback (GObject *object, tracker_sparql_connection_update_finish (connection, result, &error); - if (error == NULL || - (error != NULL && error->code != G_IO_ERROR_CANCELLED)) + if (error == NULL) { for (l = data->selection; l != NULL; l = l->next) { @@ -330,7 +329,7 @@ get_query_status (TrackerSparqlCursor *cursor, g_clear_object (&cursor); if (error == NULL || - (error != NULL && error->code != G_IO_ERROR_CANCELLED)) + (error != NULL && error->code == G_IO_ERROR_CANCELLED)) { if (op_type == GET_IDS_FOR_URLS) { -- cgit v1.2.1