Improve identification of preferred elements

Fixes #799
Alinto · Jun 22, 2017 · 9bde9b6 · 9bde9b6
1 parent 7f00afc
commit 9bde9b6
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m
@@ -458,12 +458,22 @@ - (CardElement *) _preferredElementWithTag: (NSString *) aTag
   elements = [self childrenWithTag: aTag];
   if (elements && [elements count] > 0)
     {
+      // First element of type "pref"
       prefElements = [elements cardElementsWithAttribute: @"type"
                                havingValue: @"pref"];
       if (prefElements && [prefElements count] > 0)
         element = [prefElements objectAtIndex: 0];
       else
-        element = [elements objectAtIndex: 0];
+        {
+          // First element of type "work"
+          prefElements = [elements cardElementsWithAttribute: @"type"
+                                                 havingValue: @"work"];
+          if (prefElements && [prefElements count] > 0)
+            element = [prefElements objectAtIndex: 0];
+          else
+            // Fallback
+            element = [elements objectAtIndex: 0];
+        }
     }
   else
     element = nil;