Allow deletion of a key from settings that is no longer in defaults
(cherry picked from commit b04da70)
This commit is contained in:
parent
57161dd9c3
commit
b25c2220d1
1 changed files with 1 additions and 1 deletions
|
|
@ -984,7 +984,7 @@ class Settings(object):
|
|||
if not force and key in defaults and key in config and defaults[key] == value:
|
||||
del config[key]
|
||||
self._dirty = True
|
||||
elif force or (not key in config and defaults[key] != value) or (key in config and config[key] != value):
|
||||
elif force or (not key in config and key in defaults and defaults[key] != value) or (key in config and config[key] != value):
|
||||
if value is None and key in config:
|
||||
del config[key]
|
||||
else:
|
||||
|
|
|
|||
Loading…
Reference in a new issue