rtfiles: Give user defined runtime files precedence over asset files (#3066)
This commit is contained in:
parent
9fdea82542
commit
c15abea64c
1 changed files with 9 additions and 1 deletions
|
@ -129,9 +129,17 @@ func AddRuntimeFilesFromAssets(fileType RTFiletype, directory, pattern string) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assetLoop:
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
if ok, _ := path.Match(pattern, f); ok {
|
if ok, _ := path.Match(pattern, f); ok {
|
||||||
AddRuntimeFile(fileType, assetFile(path.Join(directory, f)))
|
af := assetFile(path.Join(directory, f))
|
||||||
|
for _, rf := range realFiles[fileType] {
|
||||||
|
if af.Name() == rf.Name() {
|
||||||
|
continue assetLoop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
AddRuntimeFile(fileType, af)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue