Fixed missing contacts when importing from vcard.

Fixes Bug #742440.  After checking for an END line, another line was read
before breaking out of the loop. This could have been the BEGIN line for
the next record, in which case that record will be lost.

diff --git a/src/merge-vcard.c b/src/merge-vcard.c
index 65540151b20c26cf067f1567707a4d66d8d74eee..57e1817def5cdb105f4a851086d192b43c1a6582 100644 (file)
--- a/src/merge-vcard.c
+++ b/src/merge-vcard.c
@@ -348,7 +348,7 @@ parse_next_vcard (FILE *fp)
 
         vcard = g_malloc0(size);
 
-        while (fgets(line, sizeof(line), fp) && found_end == FALSE)
+        while (found_end == FALSE && fgets(line, sizeof(line), fp))
         {
                 if (found_begin == TRUE)
                 {