BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4342 from matiu/bug/empty-config 

fixes opts if empty
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-09 19:15:01 -03:00 committed by GitHub
parent 43f03f0bcd 268702dec0
commit 1ebe7f95d2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/services/configService.js
View File

@ -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;