Fix #2000 (Error on importing PDFs, CBZs and LRFs into Calibre)

This commit is contained in:
Kovid Goyal 2009-03-06 17:05:33 -08:00
parent df5e7a6549
commit ce5389109c
2 changed files with 2 additions and 4 deletions

View File

@ -196,8 +196,8 @@ to auto-generate a Table of Contents.
'an overview of the NCX format.'))
toc('use_auto_toc', ['--use-auto-toc'], default=False,
help=_('Normally, if the source file already has a Table of Contents, '
'it is used in preference to the autodetected one. '
'With this option, the autodetected one is always used.'))
'it is used in preference to the auto-generated one. '
'With this option, the auto-generated one is always used.'))
layout = c.add_group('page layout', _('Control page layout'))
layout('margin_top', ['--margin-top'], default=5.0,

View File

@ -46,7 +46,6 @@ class AddFiles(Add):
def metadata_delivered(self, id, mi):
if self.is_canceled():
self.reading.wakeAll()
return
if not mi.title:
mi.title = os.path.splitext(self.names[id])[0]
@ -163,7 +162,6 @@ class AddRecursive(Add):
def metadata_delivered(self, id, mi):
if self.is_canceled():
self.reading.wakeAll()
return
self.emit(SIGNAL('processed(PyQt_PyObject,PyQt_PyObject)'),
mi.title, id)