yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-06-12 22:38:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

WTF is this

Browse Source
This commit is contained in:
世界
2024-06-24 09:49:15 +08:00
parent f0eead5ed5
commit ba6ecd1c9f
41 changed files with 421 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/sing-box/cmd_run.go
View File

@@ -109,7 +109,7 @@ func readConfigAndMerge() (option.Options, error) {
}
var mergedMessage json.RawMessage
for _, options := range optionsList {
mergedMessage, err = badjson.MergeJSON(options.options.RawMessage, mergedMessage)
mergedMessage, err = badjson.MergeJSON(options.options.RawMessage, mergedMessage, false)
if err != nil {
return option.Options{}, E.Cause(err, "merge config at ", options.path)
}