From 7fc188b1722517fa29ca23cf6b61bd262062e60c Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 24 May 2017 18:20:11 -0400
Subject: [PATCH] Fix crashing for some actions in duplicate items

Necessary after more strict error handling in c4411e1ad3e
---
 chrome/content/zotero/zoteroPane.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 2a9af719e9..07fb05b01d 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -1429,8 +1429,7 @@ var ZoteroPane = new function()
 			}
 			
 			// Single item selected
-			if (this.itemsView.selection.count == 1 && this.itemsView.selection.currentIndex != -1)
-			{
+			if (selectedItems.length == 1) {
 				var item = selectedItems[0];
 				
 				if (item.isNote()) {
@@ -1520,7 +1519,7 @@ var ZoteroPane = new function()
 					ZoteroItemPane.setToggleReadLabel();
 				}
 				
-				var count = this.itemsView.selection.count;
+				let count = selectedItems.length;
 				
 				// Display duplicates merge interface in item pane
 				if (collectionTreeRow.isDuplicates()) {