diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 6a9679686..ec4bfa1e0 100755 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -5417,8 +5417,9 @@ class GedcomParser(UpdateCallback): @type state: CurrentState """ - if self.is_ftw and state.event.type in FTW_BAD_PLACE: - state.event.set_description(line.data) + if self.is_ftw and (state.event.type in FTW_BAD_PLACE) \ + and not state.event.get_description(): + state.event.set_description(line.data) else: title = line.data place = state.place @@ -5448,8 +5449,8 @@ class GedcomParser(UpdateCallback): state.msg += sub_state.msg if sub_state.pf: # if we found local PLAC:FORM state.pf = sub_state.pf # save to override global value - # merge notes etc into place - state.place.merge(sub_state.place) + # merge notes etc into place + state.place.merge(sub_state.place) def __event_place_note(self, line, state): """