diff --git a/package.json b/package.json index 18ab50a..4c5e08b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghetto-skype", - "version": "1.2.0", + "version": "1.2.1", "productName": "Ghetto Skype", "description": "Web Skype + Tray Icon + Notifications", "private": true, diff --git a/tray.js b/tray.js index 15a52d6..8f8526e 100644 --- a/tray.js +++ b/tray.js @@ -79,10 +79,10 @@ let settingFile = electron.app.getPath('userData') + '/settings.json'; let Settings; try { - settingFile = JSON.parse(fs.readFileSync(settingFile)); - Settings = require('./settings.json'); + let tmpSettings = JSON.parse(fs.readFileSync(settingFile)); + Settings = require('./settings.json'); - Object.assign(Settings, settingFile); + Object.assign(Settings, tmpSettings); } catch(e) { Settings = require('./settings.json'); }