From d0a546b3d6fd72d415da574566a0268c435a37b3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 13 Apr 2010 09:11:10 +0530 Subject: [PATCH] Fix sending multiple files by email causes them to be mixed up. Also Fix #5069 (No error when mail password is incorrect) --- src/calibre/gui2/device.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 324b0f35cf..47cc291b8c 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -558,7 +558,8 @@ class DeviceGUI(object): specific_format=specific_format, exclude_auto=do_auto_convert) if do_auto_convert: - ids = list(set(ids).difference(_auto_ids)) + nids = list(set(ids).difference(_auto_ids)) + ids = [i for i in ids if i in nids] else: _auto_ids = [] @@ -653,7 +654,7 @@ class DeviceGUI(object): ]) error_dialog(self, _('Failed to email books'), _('Failed to email the following books:'), - '%s'%errors + '%s'%errors, show=True ) else: self.status_bar.showMessage(_('Sent by email:') + ', '.join(good),