Write to disk merged base + user config files
This commit is contained in:
parent
92f6274458
commit
cc4a33bb04
5
TODO.md
5
TODO.md
@ -11,11 +11,9 @@
|
|||||||
- When qml syntax highlighting supports ES6 string interpolation, use them
|
- When qml syntax highlighting supports ES6 string interpolation, use them
|
||||||
|
|
||||||
- Fixes
|
- Fixes
|
||||||
- make install
|
- `make install`
|
||||||
- Make uvloop optional
|
- Make uvloop optional
|
||||||
- Distribute fonts
|
|
||||||
- Backspace bug
|
- Backspace bug
|
||||||
- Add missing shortcuts to config file
|
|
||||||
|
|
||||||
- Show error if uploading avatar fails or file is corrupted
|
- Show error if uploading avatar fails or file is corrupted
|
||||||
|
|
||||||
@ -92,6 +90,7 @@
|
|||||||
- Spinner when loading past room events or images
|
- Spinner when loading past room events or images
|
||||||
|
|
||||||
- Theming
|
- Theming
|
||||||
|
- Bundle fonts
|
||||||
- File format
|
- File format
|
||||||
- icons.preferredPack: accept multiple values
|
- icons.preferredPack: accept multiple values
|
||||||
- Find icon packs in user data dir
|
- Find icon packs in user data dir
|
||||||
|
@ -59,7 +59,7 @@ class JSONConfigFile(ConfigFile):
|
|||||||
all_data = await self.default_data()
|
all_data = await self.default_data()
|
||||||
dict_update_recursive(all_data, data)
|
dict_update_recursive(all_data, data)
|
||||||
|
|
||||||
if len(data) != len(all_data):
|
if data != all_data:
|
||||||
await self.write(all_data)
|
await self.write(all_data)
|
||||||
|
|
||||||
return all_data
|
return all_data
|
||||||
|
Loading…
Reference in New Issue
Block a user