Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ooops. That fix had side effects even if there were errors

Browse Source
This commit is contained in:
Charles Haley 2020-08-01 13:43:00 +01:00
parent dac7563405
commit 03b3574e8e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -543,8 +543,6 @@ class CreateCustomColumn(QDialog):
default_val = (unicode_type(self.default_value.text()).strip() default_val = (unicode_type(self.default_value.text()).strip()
if col_type != 'composite' else None) if col_type != 'composite' else None)
if self.editing_col:
self.parent.custcols[self.orig_column_name]['display'].pop('default_value', None)
if col_type == 'datetime': if col_type == 'datetime':
if unicode_type(self.format_box.text()).strip(): if unicode_type(self.format_box.text()).strip():
@ -668,6 +666,8 @@ class CreateCustomColumn(QDialog):
else: else:
self.parent.custcols[self.orig_column_name]['label'] = col self.parent.custcols[self.orig_column_name]['label'] = col
self.parent.custcols[self.orig_column_name]['name'] = col_heading 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]['display'].update(display_dict)
self.parent.custcols[self.orig_column_name]['*edited'] = True self.parent.custcols[self.orig_column_name]['*edited'] = True
self.parent.custcols[self.orig_column_name]['*must_restart'] = True self.parent.custcols[self.orig_column_name]['*must_restart'] = True