completion: fail silently if _init_completion is not found

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index c76029067f4c28b32933e26e432713f39becd4b0..9c0952a495cf800bbb176e05013d098e1d72387a 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -524,7 +524,7 @@ parse_references (void *ctx,
                  GHashTable *hash,
                  const char *refs)
 {
-    char *ref;
+    char *ref, *last_ref = NULL;
 
     if (refs == NULL || *refs == '\0')
        return NULL;
@@ -532,20 +532,17 @@ parse_references (void *ctx,
     while (*refs) {
        ref = _parse_message_id (ctx, refs, &refs);
 
-       if (ref && strcmp (ref, message_id))
+       if (ref && strcmp (ref, message_id)) {
            g_hash_table_insert (hash, ref, NULL);
+           last_ref = ref;
+       }
     }
 
     /* The return value of this function is used to add a parent
      * reference to the database.  We should avoid making a message
-     * its own parent, thus the following check.
+     * its own parent, thus the above check.
      */
-
-    if (ref && strcmp(ref, message_id)) {
-       return ref;
-    } else {
-       return NULL;
-    }
+    return last_ref;
 }
 
 notmuch_status_t