mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Fix sending multiple files by email causes them to be mixed up. Also Fix #5069 (No error when mail password is incorrect)
This commit is contained in:
parent
a5eeb6724d
commit
d0a546b3d6
@ -558,7 +558,8 @@ class DeviceGUI(object):
|
|||||||
specific_format=specific_format,
|
specific_format=specific_format,
|
||||||
exclude_auto=do_auto_convert)
|
exclude_auto=do_auto_convert)
|
||||||
if 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:
|
else:
|
||||||
_auto_ids = []
|
_auto_ids = []
|
||||||
|
|
||||||
@ -653,7 +654,7 @@ class DeviceGUI(object):
|
|||||||
])
|
])
|
||||||
error_dialog(self, _('Failed to email books'),
|
error_dialog(self, _('Failed to email books'),
|
||||||
_('Failed to email the following books:'),
|
_('Failed to email the following books:'),
|
||||||
'%s'%errors
|
'%s'%errors, show=True
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.status_bar.showMessage(_('Sent by email:') + ', '.join(good),
|
self.status_bar.showMessage(_('Sent by email:') + ', '.join(good),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user