Do not return empty theme dirs

This prevents reading data etc. from the root.

Fixes #2320
This commit is contained in:
Bjørn Erik Pedersen 2016-07-30 16:21:57 +02:00
parent 4ddd5361c1
commit 5f5fccbc36

View file

@ -183,13 +183,15 @@ func GetThemeDataDirPath() (string, error) {
}
func getThemeDirPath(path string) (string, error) {
var themeDir string
if ThemeSet() {
themeDir = filepath.Join(GetThemeDir(), path)
if !ThemeSet() {
return "", errors.New("No theme set")
}
themeDir := filepath.Join(GetThemeDir(), path)
if _, err := os.Stat(themeDir); os.IsNotExist(err) {
return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir)
}
}
return themeDir, nil
}