Fixed problem with settings accidently getting overwritten

RoyalBingBong · Jun 11, 2017 · f21c320 · f21c320
1 parent 4a323e4
commit f21c320
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/app/config.json b/app/config.json
@@ -6,7 +6,7 @@
       "muted": true,
       "skipInterval": 5
     },
-    "window":{
+    "UI":{
       "statusbar": {
         "enabled": true,
         "autohide": true

diff --git a/src/controller.js b/src/controller.js
@@ -590,36 +590,36 @@ export function closeApp() {
 }
 
 export function isAutohidePlaybackUI() {
-  return !!settings.getSync('window.playback.autohide')
+  return !!settings.getSync('UI.playback.autohide')
 }
 
 export function toggleAutohidePlaybackUI(state) {
-  settings.setSync('window.playback.autohide', state)
+  settings.setSync('UI.playback.autohide', state)
 }
 
 export function isAutohideStatusbar() {
-  return !!settings.getSync('window.statusbar.autohide')
+  return !!settings.getSync('UI.statusbar.autohide')
 }
 
 export function toggleAutohideStatusbar(state) {
-  settings.setSync('window.statusbar.autohide', state)
+  settings.setSync('UI.statusbar.autohide', state)
 }
 
 export function isStatusbarEnabled() {
-  return !!settings.getSync('window.statusbar.enabled')
+  return !!settings.getSync('UI.statusbar.enabled')
 }
 
 export function toggleStatusbarVisibility(state) {
-  settings.setSync('window.statusbar.enabled', state)
+  settings.setSync('UI.statusbar.enabled', state)
   viewer.updateStatusbarStyle()
 }
 
 export function isPlaybackUIEnabled() {
-  return !!settings.getSync('window.playback.enabled')
+  return !!settings.getSync('UI.playback.enabled')
 }
 
 export function togglePlaybackUIVisibility(state) {
-  settings.setSync('window.playback.enabled', state)
+  settings.setSync('UI.playback.enabled', state)
   viewer.updateElementStyle()
   viewer.updateStatusbarStyle()
 }
diff --git a/src/main.js b/src/main.js
@@ -2,6 +2,7 @@ import {app, ipcMain, BrowserWindow} from 'electron'
 import {join} from 'path'
 import settings from 'electron-settings'
 import {isEnvDeveloper} from './helper.js'
+import {defaultSettings} from '../config.json'
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -20,6 +21,7 @@ app.on('ready', () => {
   settings.configure({
     prettify: true
   })
+  settings.defaults(defaultSettings)
   // Create the browser window.
   mainWindow = new BrowserWindow({
     width: settings.getSync('window.width') || 800,