Protect against crash when collection is removed during empty-trash

Juris-M · Mar 2, 2017 · 48aeb99 · 48aeb99
1 parent 2dbf0e2
commit 48aeb99
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/chrome/content/zotero/xpcom/data/collection.js b/chrome/content/zotero/xpcom/data/collection.js
@@ -640,7 +640,11 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
 		let deletedCollections = new Set(env.deletedObjectIDs);
 		itemsToUpdate.forEach(itemID => {
 			let item = Zotero.Items.get(itemID);
-			item._collections = item._collections.filter(c => !deletedCollections.has(c));
+			// XXX Condition protects against crash when collection is removed
+			// XXX while empty-trash operation is in progress.
+			if (item._collections) {
+				item._collections = item._collections.filter(c => !deletedCollections.has(c));
+			}
 		});
 	}
 });