Fail safe window state reading

szwacz · Feb 29, 2016 · 60bd286 · 60bd286
1 parent 2022260
commit 60bd286
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/app/vendor/electron_boilerplate/window_state.js b/app/vendor/electron_boilerplate/window_state.js
@@ -9,12 +9,21 @@ export default function (name, defaults) {
 
     var userDataDir = jetpack.cwd(app.getPath('userData'));
     var stateStoreFile = 'window-state-' + name +'.json';
-
-    var state = userDataDir.read(stateStoreFile, 'json') || {
+    var state = {
         width: defaults.width,
         height: defaults.height
     };
 
+    try {
+        var loadedState = userDataDir.read(stateStoreFile, 'json');
+        if (loadedState != null) {
+            state = loadedState;
+        }
+    } catch (err) {
+        // For some reason json can't be read.
+        // No worries, we have defaults.
+    }
+
     var saveState = function (win) {
         if (!win.isMaximized() && !win.isMinimized()) {
             var position = win.getPosition();