do not override peristent.json with an empty drawing when changing persistency setting

This commit is contained in:
abakkk 2020-01-10 13:01:26 +01:00
parent aa0a984878
commit e0ce5e0096
2 changed files with 10 additions and 1 deletions

View File

@ -714,6 +714,15 @@ var DrawingArea = new Lang.Class({
this._saveAsJson(Me.metadata['persistent-file-name']); this._saveAsJson(Me.metadata['persistent-file-name']);
}, },
syncPersistent: function() {
// do not override peristent.json with an empty drawing when changing persistency setting
if (!this.elements.length)
this._loadPersistent();
else
this.savePersistent();
},
_loadJson: function(name, notify) { _loadJson: function(name, notify) {
let dir = GLib.get_user_data_dir(); let dir = GLib.get_user_data_dir();
let path = GLib.build_filenamev([dir, Me.metadata['data-dir'], `${name}.json`]); let path = GLib.build_filenamev([dir, Me.metadata['data-dir'], `${name}.json`]);

View File

@ -124,7 +124,7 @@ var AreaManager = new Lang.Class({
onPersistentSettingChanged: function() { onPersistentSettingChanged: function() {
if (this.settings.get_boolean('persistent-drawing')) if (this.settings.get_boolean('persistent-drawing'))
this.areas[Main.layoutManager.primaryIndex].savePersistent(); this.areas[Main.layoutManager.primaryIndex].syncPersistent();
}, },
updateIndicator: function() { updateIndicator: function() {