X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fmodel%2Ffolder.go;h=c73accc2789b69d0df8b979a2329a0b269ce71e3;hb=8f41ac456fc92a9ec333579498e9933d73404905;hp=fa9440999b68ec04ce0b2ab1906b2ccab32edd0b;hpb=dd62e1e5ec325c77164c578d11ba4c0e118307d9;p=src%2Fxds%2Fxds-server.git diff --git a/lib/model/folder.go b/lib/model/folder.go index fa94409..c73accc 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -48,7 +48,7 @@ func (c *Folder) UpdateAll(newCfg xdsconfig.Config) error { Label: f.Label, RelativePath: f.RelativePath, SyncThingID: f.SyncThingID, - ShareRootDir: c.ShareRootDir, + ShareRootDir: c.FileConf.ShareRootDir, }); err != nil { return err } @@ -62,7 +62,7 @@ func (c *Folder) UpdateAll(newCfg xdsconfig.Config) error { func (c *Folder) UpdateFolder(newFolder xdsconfig.FolderConfig) (xdsconfig.FolderConfig, error) { // rootPath should not be empty if newFolder.RootPath == "" { - newFolder.RootPath = c.Conf.ShareRootDir + newFolder.RootPath = c.Conf.FileConf.ShareRootDir } // Sanity check of folder settings