Skip to content

Commit 33874e1

Browse files
committed
Fix importmerge tool for crash on editing imported db
1 parent fb525ab commit 33874e1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

ImportMerge/importmerge.gpr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
id = 'import_merge',
3030
name = _("Import and Merge tool"),
3131
description = _("Compares a Gramps XML database with the current one, and allows merging of the differences."),
32-
version = '0.0.10',
32+
version = '0.0.11',
3333
gramps_target_version = "5.0",
3434
status = STABLE,
3535
fname = 'importmerge.py',

ImportMerge/importmerge.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,8 @@ def edit_callback(self, *args):
10271027
Should never get a delete operation'''
10281028
edit_hndl = self.diff_list[self.diff_iter][HNDL]
10291029
obj_type = args[0].capitalize()
1030+
handle_func1 = self.db1.method('get_%s_from_handle', obj_type)
1031+
handle_func2 = self.db2.method('get_%s_from_handle', obj_type)
10301032
if args[1] == 'update':
10311033
for hndl in args[2]:
10321034
if self.added.get(hndl) or self.diffs.get(hndl):

0 commit comments

Comments
 (0)