From 82731ae9b23fa65bbb5691d6bf21845aa8dbc799 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 8 Apr 2012 10:36:43 +0530 Subject: [PATCH] Fix regression in automatic adding in 0.8.46 that broke automatic adding if adding of duplicates is enabled and auto convert is also enabled --- src/calibre/library/database2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 72ff9cd08d..47bde01a81 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -3289,7 +3289,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): paths = list(duplicate[0] for duplicate in duplicates) formats = list(duplicate[1] for duplicate in duplicates) metadata = list(duplicate[2] for duplicate in duplicates) - return (paths, formats, metadata), len(ids) + return (paths, formats, metadata), (ids if return_ids else + len(ids)) return None, (ids if return_ids else len(ids)) def import_book(self, mi, formats, notify=True, import_hooks=True,