LK/xmtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix crash when loading a custom colorscheme

Browse Source 
When using `cs, err := ...` in a nested scope, it masks `cs` and `err`
from any parent scope.
This commit is contained in:
Markus Peloquin 2020-03-14 23:02:05 -07:00
parent 025527730f
commit 43227744e7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
colorschemes/registry.go
View File

@ -18,14 +18,11 @@ func init() {
}
func FromName(confDir configdir.ConfigDir, c string) (Colorscheme, error) {
cs, ok := registry[c]
if !ok {
cs, err := getCustomColorscheme(confDir, c)
if err != nil {
return cs, err
}
if cs, ok := registry[c]; ok {
return cs, nil
}
return cs, nil
cs, err := getCustomColorscheme(confDir, c)
return cs, err
}
func register(name string, c Colorscheme) {