From 9bde9b66ef00be2089216bab6fed826897d1ecb1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 21 Jun 2017 16:29:11 -0400
Subject: [PATCH] Improve identification of preferred elements

Fixes #799
---
 SOPE/NGCards/NGVCard.m | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m
index 36eaa4135..24f1f879e 100644
--- a/SOPE/NGCards/NGVCard.m
+++ b/SOPE/NGCards/NGVCard.m
@@ -458,12 +458,22 @@
   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;