_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix config loading

Browse Source
This commit is contained in:
Anton Bracke
2022-02-22 20:24:09 +01:00
parent 445bcaf130
commit 44a9e2aeb0
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/electron/src/ipc.ts
+6 -5
View File
@@ -58,13 +58,14 @@ export default () => {
ipcMain.handle("local-app:addServer", (event, server: Omit<Server, "_id">) => { ipcMain.handle("local-app:addServer", (event, server: Omit<Server, "_id">) => {
const servers = settings.get("servers") || []; const servers = settings.get("servers") || [];
try {
// TODO: add proper test to see if server url is valid and points to a real WA server // TODO: add proper test to see if server url is valid and points to a real WA server
// try {
//
// await fetch(`${server.url}/iframe_api.js`); // await fetch(`${server.url}/iframe_api.js`);
} catch (e) { // } catch (e) {
console.error(e); // console.error(e);
return new Error("Invalid server url"); // return new Error("Invalid server url");
} // }
const newServer = { const newServer = {
...server, ...server,
desktop/electron/src/settings.ts
+1 -1
View File
@@ -29,7 +29,7 @@ const defaultSettings: SettingsData = {
async function init() { async function init() {
let _settings = await Settings.get(); let _settings = await Settings.get();
if (_settings !== undefined) { if (Object.keys(_settings).length === 0) {
_settings = defaultSettings; _settings = defaultSettings;
} }
settings = _settings as SettingsData; settings = _settings as SettingsData;