From bc34e74bc86782f4e6fef0845e96ca7d8465cb5c Mon Sep 17 00:00:00 2001
From: Nigel Horne <njh@bandsman.co.uk>
Date: Sun, 25 Aug 2024 08:17:29 -0400
Subject: [PATCH] Don't say twice that someone was in the Navy

---
 gedcom | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gedcom b/gedcom
index e6e3e86..975e061 100755
--- a/gedcom
+++ b/gedcom
@@ -6253,7 +6253,7 @@ sub print_person
 						$phrase->append(' ' . ucfirst($event) . '. ');
 					}
 				}
-				if(ref($event) eq 'Gedcom::Record') {
+				if($event->can('type')) {
 					my $type = $event->type();
 					print "Event type: $type\n" if($opts{'v'});
 					if($type eq 'Military service') {
@@ -6295,7 +6295,9 @@ sub print_person
 							$mentioned_military = 1;
 						}
 
-						append_notes({ phrase => $phrase, record => $event });
+						if((!$mentioned_military) || (notes(record => $event) ne 'Royal Navy.')) {
+							append_notes({ phrase => $phrase, record => $event });
+						}
 						push @phrases, $phrase;
 						$phrase = Data::Text->new();
 					} elsif($type eq 'Arrival') {