Fix #1917 (Calibre will not close when clicking any exit button)

This commit is contained in:
Kovid Goyal 2009-03-06 21:58:22 -08:00
parent aa548ea915
commit ffb5b5d966
2 changed files with 10 additions and 2 deletions

View File

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

View File

@ -320,11 +320,17 @@ class ConfigDialog(QDialog, Ui_Dialog):
layout.addWidget(QLabel(_('Error log:'))) layout.addWidget(QLabel(_('Error log:')))
el = QPlainTextEdit(d) el = QPlainTextEdit(d)
layout.addWidget(el) layout.addWidget(el)
el.setPlainText(open(log_error_file, 'rb').read().decode('utf8', 'replace')) try:
el.setPlainText(open(log_error_file, 'rb').read().decode('utf8', 'replace'))
except IOError:
el.setPlainText('No error log found')
layout.addWidget(QLabel(_('Access log:'))) layout.addWidget(QLabel(_('Access log:')))
al = QPlainTextEdit(d) al = QPlainTextEdit(d)
layout.addWidget(al) layout.addWidget(al)
al.setPlainText(open(log_access_file, 'rb').read().decode('utf8', 'replace')) try:
al.setPlainText(open(log_access_file, 'rb').read().decode('utf8', 'replace'))
except IOError:
el.setPlainText('No access log found')
d.show() d.show()
def set_server_options(self): def set_server_options(self):