From 43227744e7ed9821c4543fa1d6212a6f9418ceb9 Mon Sep 17 00:00:00 2001 From: Markus Peloquin Date: Sat, 14 Mar 2020 23:02:05 -0700 Subject: Fix crash when loading a custom colorscheme When using `cs, err := ...` in a nested scope, it masks `cs` and `err` from any parent scope. --- colorschemes/registry.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/colorschemes/registry.go b/colorschemes/registry.go index 8f86491..b6263c9 100644 --- a/colorschemes/registry.go +++ b/colorschemes/registry.go @@ -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) { -- cgit v1.2.3