Commit 90354b9e4feea3ca7c89e032838a25276a86f96d
Fix config merge
Anders Rune Jensen committed on 2/7/2019, 8:11:43 PMParent: 567390e76391b1a414b24872b0f4bdb48c2e48b4
Files changed
config.js | changed |
config.js | ||
---|---|---|
@@ -50,14 +50,16 @@ | ||
50 | 50 … | function PubHopSettings (config) { |
51 | 51 … | const pubHopAll = 3 |
52 | 52 … | let pubHopConnections = settings.create().settings.sync.get('patchbay.pubHopConnections', pubHopAll) |
53 | 53 … | if (pubHopConnections != pubHopAll) { |
54 | - return { | |
55 | - friendPub: { hops: pubHopConnections }, | |
56 | - gossip: { | |
57 | - friends: true, | |
58 | - global: false | |
59 | - } | |
60 | - } | |
54 … | + return merge( | |
55 … | + config, | |
56 … | + { | |
57 … | + friendPub: { hops: pubHopConnections }, | |
58 … | + gossip: { | |
59 … | + friends: true, | |
60 … | + global: false | |
61 … | + } | |
62 … | + }) | |
61 | 63 … | } else |
62 | - return {} | |
64 … | + return config | |
63 | 65 … | } |
Built with git-ssb-web