From b4deb0f13835323929968212a6520b66e10c09eb Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Tue, 28 Jul 2026 19:19:37 +0100 Subject: [PATCH] Ensure both snapshot and settings catalogues used --- lib/launcher.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/launcher.js b/lib/launcher.js index a9a50c3f..3e73fe7f 100644 --- a/lib/launcher.js +++ b/lib/launcher.js @@ -345,14 +345,11 @@ class Launcher { // if licensed, add palette catalogues if (this.config.licensed) { if (this.project) { - if (this.snapshot?.settings?.palette?.catalogue !== undefined) { - settings.editorTheme.palette.catalogues = this.snapshot.settings.palette.catalogue - // need to merge in settings catalogues and remove duplicates - const temp = [...(this.settings?.palette?.catalogues || []), ...(this.snapshot.settings?.palette?.catalogue || [])] - settings.editorTheme.palette.catalogues = temp.filter((item, pos, self) => { - return self.indexOf(item) === pos - }) - } + // need to merge in settings catalogues and remove duplicates + const temp = [...(this.settings?.palette?.catalogues || []), ...(this.snapshot.settings?.palette?.catalogue || [])] + settings.editorTheme.palette.catalogues = temp.filter((item, pos, self) => { + return self.indexOf(item) === pos + }) } else if (this.application) { if (this.settings.palette?.catalogues) { settings.editorTheme.palette.catalogues = this.settings.palette.catalogues