tool import now does a merge instead of overwrite
This commit is contained in:
parent
240d571073
commit
99cc19622d
2 changed files with 8 additions and 3 deletions
|
|
@ -582,7 +582,13 @@ function settingsImport(data, ask) {
|
|||
api.space.restore(() => { ui.sync() }, true);
|
||||
}
|
||||
if (isTools && Array.isArray(data.tools)) {
|
||||
settings.tools = data.tools;
|
||||
const settool = settings.tools;
|
||||
for (let tool of data.tools) {
|
||||
if (settool.filter(t => t.id === tool.id).length === 0) {
|
||||
settool.push(tool);
|
||||
}
|
||||
}
|
||||
// settings.tools = data.tools;
|
||||
api.show.tools();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue