mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-07 09:01:38 -04:00
Fix one remaining unsafe use of read_lock. Fixes #1348937 [Downgrade Lock Error: cant downgrade Lock Object](https://bugs.launchpad.net/calibre/+bug/1348937)
This commit is contained in:
parent
caa0623ae1
commit
124310d536
@ -760,14 +760,11 @@ class BooksModel(QAbstractTableModel): # {{{
|
||||
return QVariant(int(fffunc(field_obj, idfunc(idx), default_value=0)/2.0))
|
||||
elif dt == 'series':
|
||||
sidx_field = self.db.new_api.fields[field + '_index']
|
||||
fffunc = self.db.new_api._fast_field_for
|
||||
read_lock = self.db.new_api.read_lock
|
||||
def func(idx):
|
||||
book_id = idfunc(idx)
|
||||
with read_lock:
|
||||
series = fffunc(field_obj, book_id, default_value=False)
|
||||
if series:
|
||||
return QVariant('%s [%s]' % (series, fmt_sidx(fffunc(sidx_field, book_id, default_value=1.0))))
|
||||
series = fffunc(field_obj, book_id, default_value=False)
|
||||
if series:
|
||||
return QVariant('%s [%s]' % (series, fmt_sidx(fffunc(sidx_field, book_id, default_value=1.0))))
|
||||
return NONE
|
||||
elif dt in {'int', 'float'}:
|
||||
fmt = m['display'].get('number_format', None)
|
||||
|
Loading…
x
Reference in New Issue
Block a user