From 268702dec0a2772a4c7ba0c87cc3a2ecb2549878 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 9 Jun 2016 19:00:09 -0300 Subject: [PATCH] fixes oopts if empty --- src/js/services/configService.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 6e0e67871..9af77287d 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -125,6 +125,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer root.set = function(newOpts, cb) { var config = lodash.cloneDeep(defaultConfig); storageService.getConfig(function(err, oldOpts) { + oldOpts = oldOpts || {}; + if (lodash.isString(oldOpts)) { oldOpts = JSON.parse(oldOpts); } @@ -134,6 +136,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer if (lodash.isString(newOpts)) { newOpts = JSON.parse(newOpts); } + lodash.merge(config, oldOpts, newOpts); configCache = config;