summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/setting/setting.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index d07dce39a0..f24a87653b 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -595,6 +595,8 @@ func NewContext() {
if len(CustomConf) == 0 {
CustomConf = CustomPath + "/conf/app.ini"
+ } else if !filepath.IsAbs(CustomConf) {
+ CustomConf = filepath.Join(workDir, CustomConf)
}
if com.IsFile(CustomConf) {