mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #1917 (Calibre will not close when clicking any exit button)
This commit is contained in:
parent
aa548ea915
commit
ffb5b5d966
@ -46,6 +46,7 @@ class AddFiles(Add):
|
||||
|
||||
def metadata_delivered(self, id, mi):
|
||||
if self.is_canceled():
|
||||
self.wake_up()
|
||||
return
|
||||
if not mi.title:
|
||||
mi.title = os.path.splitext(self.names[id])[0]
|
||||
@ -162,6 +163,7 @@ class AddRecursive(Add):
|
||||
|
||||
def metadata_delivered(self, id, mi):
|
||||
if self.is_canceled():
|
||||
self.wake_up()
|
||||
return
|
||||
self.emit(SIGNAL('processed(PyQt_PyObject,PyQt_PyObject)'),
|
||||
mi.title, id)
|
||||
|
@ -320,11 +320,17 @@ class ConfigDialog(QDialog, Ui_Dialog):
|
||||
layout.addWidget(QLabel(_('Error log:')))
|
||||
el = QPlainTextEdit(d)
|
||||
layout.addWidget(el)
|
||||
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:')))
|
||||
al = QPlainTextEdit(d)
|
||||
layout.addWidget(al)
|
||||
try:
|
||||
al.setPlainText(open(log_access_file, 'rb').read().decode('utf8', 'replace'))
|
||||
except IOError:
|
||||
el.setPlainText('No access log found')
|
||||
d.show()
|
||||
|
||||
def set_server_options(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user