1.2 introduced bug with saving settings

stanfieldr · May 16, 2016 · 6b42239 · 6b42239
1 parent 67cc928
commit 6b42239
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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');
 }