From 2a9c9dd07f8ece199888d1ae8e6ada3340743a74 Mon Sep 17 00:00:00 2001
From: Tim G L Lyons <tim.g.lyons@gmail.com>
Date: Tue, 5 Jun 2012 18:19:13 +0000
Subject: [PATCH] 0005781: Errors with Merge Citations. Amended so it checks
 whether the first citation processed for a particular
 page/volume/confidence/date (as applicable) has notes.

svn: r19762
---
 src/plugins/tool/MergeCitations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/tool/MergeCitations.py b/src/plugins/tool/MergeCitations.py
index 3798444b7..e1ff86732 100644
--- a/src/plugins/tool/MergeCitations.py
+++ b/src/plugins/tool/MergeCitations.py
@@ -215,7 +215,7 @@ class MergeCitations(tool.BatchTool,ManagedWindow.ManagedWindow):
                             "citation backlink handles", \
                             list(db.find_backlink_handles(citation.get_handle()))
                         num_merges += 1
-                    else:
+                    elif (not dont_merge_notes or len(citation.note_list) == 0):
                         dict[key] = citation_handle
                     self.progress.step()
         db.enable_signals()