[nautilus/sam/tracker-3: 1/8] tag-manager: Fix checks for cancellation




commit f90de556b56a63cac702920a2cd9cb6de8fefd4b
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun May 3 20:18:03 2020 +0200

    tag-manager: Fix checks for cancellation
    
    We were accidentally ignoring the real errors, rather than
    ignoring only the cancellation errors.

 src/nautilus-tag-manager.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
index 78c81e0b6..b5300f172 100644
--- a/src/nautilus-tag-manager.c
+++ b/src/nautilus-tag-manager.c
@@ -246,7 +246,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))
+        (error != NULL && error->code == G_IO_ERROR_CANCELLED))
     {
         for (l = data->selection; l != NULL; l = l->next)
         {
@@ -287,7 +287,7 @@ on_update_callback (GObject      *object,
         g_task_return_boolean (data->task, TRUE);
         g_object_unref (data->task);
     }
-    else if (error && error->code == G_IO_ERROR_CANCELLED)
+    if (error && error->code == G_IO_ERROR_CANCELLED)
     {
         g_error_free (error);
     }
@@ -330,7 +330,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)
             {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]