From 2f47d491686cb929b458ea660aee2f93ae19565b Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 23 Mar 2019 20:54:24 -0700 Subject: [PATCH] Fix bug causing board configuration to be deleted from Conf on settings export. --- src/General/Settings.coffee | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index 8953ebc62..09e205873 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -206,11 +206,13 @@ Settings = $.after $('input[name="Stubs"]', section).parentNode.parentNode, div export: -> - # Make sure to export the most recent data. - $.get Conf, (Conf) -> + # Make sure to export the most recent data, but don't overwrite existing `Conf` object. + Conf2 = {} + $.extend Conf2, Conf + $.get Conf2, (Conf2) -> # Don't export cached JSON data. - delete Conf['boardConfig'] - (Settings.downloadExport {version: g.VERSION, date: Date.now(), Conf}) + delete Conf2['boardConfig'] + (Settings.downloadExport {version: g.VERSION, date: Date.now(), Conf: Conf2}) downloadExport: (data) -> a = $.el 'a',