From 60b0d68516b51951f00390e73c4ad63d6e84ae3c Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sun, 5 Feb 2017 13:33:23 +0100
Subject: [PATCH] fix #428: cacheConfigSettings config option

---
 app/scripts/app.js                       | 2 +-
 app/scripts/models/app-model.js          | 1 +
 app/scripts/models/app-settings-model.js | 3 ++-
 release-notes.md                         | 1 +
 util/config-example.json                 | 4 +++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/scripts/app.js b/app/scripts/app.js
index a8f95c1c..2fc7eb80 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -27,7 +27,7 @@ $(() => {
     if (configParam) {
         appModel.loadConfig(configParam, err => {
             SettingsManager.setBySettings(appModel.settings);
-            if (err) {
+            if (err && !appModel.settings.get('cacheConfigSettings')) {
                 showSettingsLoadError();
             } else {
                 showApp();
diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js
index dd29d39e..5110e594 100644
--- a/app/scripts/models/app-model.js
+++ b/app/scripts/models/app-model.js
@@ -68,6 +68,7 @@ const AppModel = Backbone.Model.extend({
                     response = JSON.parse(response);
                 } catch (e) {
                     this.appLogger.error('Error parsing response', e, response);
+                    return callback(true);
                 }
             }
             if (!response.settings) {
diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js
index 2c04e6c0..0dc644ff 100644
--- a/app/scripts/models/app-settings-model.js
+++ b/app/scripts/models/app-settings-model.js
@@ -38,7 +38,8 @@ const AppSettingsModel = Backbone.Model.extend({
         dropbox: true,
         webdav: true,
         gdrive: true,
-        onedrive: true
+        onedrive: true,
+        cacheConfigSettings: false
     },
 
     initialize: function() {
diff --git a/release-notes.md b/release-notes.md
index 50a678aa..440dd2d3 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -2,6 +2,7 @@ Release notes
 -------------
 ##### v1.5.0 (TBD)
 `+` file path hint in recent files list  
+`+` cacheConfigSettings config option  
 
 ##### v1.4.0 (2017-02-04)
 KDBX4 format support and minor improvements  
diff --git a/util/config-example.json b/util/config-example.json
index e2da4b1f..ab932bdc 100644
--- a/util/config-example.json
+++ b/util/config-example.json
@@ -38,7 +38,9 @@
     "gdriveClientId": null,
 
     "onedrive": true,
-    "onedriveClientId": null
+    "onedriveClientId": null,
+
+    "cacheConfigSettings": false
   },
   "files": [{
     "storage": "webdav",