Merge branch 'master' of https://github.com/cbhaley/calibre into master

Fix #1889973 [custom column of bool type: cannot delete default value once it's set](https://bugs.launchpad.net/calibre/+bug/1889973)
This commit is contained in:
Kovid Goyal 2020-08-01 18:35:34 +05:30
commit bb8ca90eb2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -666,6 +666,8 @@ class CreateCustomColumn(QDialog):
else:
self.parent.custcols[self.orig_column_name]['label'] = col
self.parent.custcols[self.orig_column_name]['name'] = col_heading
# Remove any previous default value
self.parent.custcols[self.orig_column_name]['display'].pop('default_value', None)
self.parent.custcols[self.orig_column_name]['display'].update(display_dict)
self.parent.custcols[self.orig_column_name]['*edited'] = True
self.parent.custcols[self.orig_column_name]['*must_restart'] = True