diff --git a/bin/syncthing/syncthing-linux b/bin/syncthing/syncthing-linux old mode 100644 new mode 100755 diff --git a/src/state/syncthing.js b/src/state/syncthing.js index 899ac115..c2b0b34b 100644 --- a/src/state/syncthing.js +++ b/src/state/syncthing.js @@ -4,7 +4,7 @@ const nanoid = require('nanoid') const winston = require('winston'); const path = require('path'); const { spawn } = require('child_process'); -const parser = require('fast-xml-parser'); +const xml_parser = require('fast-xml-parser'); const axios = require('axios'); const https = require('https'); const kill = require('tree-kill'); @@ -24,6 +24,7 @@ let spawnedProcess; let xmlObj; // Syncthing XML Config let myId; // Syncthing Device ID const cacheObj = {}; +const parser = new xml_parser.XMLParser(); let uiAddress; killQueue.addToKillQueue( diff --git a/src/util/admin.js b/src/util/admin.js index e6e3c583..570abc56 100644 --- a/src/util/admin.js +++ b/src/util/admin.js @@ -350,6 +350,7 @@ exports.lockAdminApi = async (val) => { exports.enableFederation = async (val) => { const loadConfig = await this.loadFile(config.configFile); + if (!loadConfig.federation) { loadConfig.federation = {}; } loadConfig.federation.enabled = val; await this.saveFile(loadConfig, config.configFile);