diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-05 01:10:23 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 19:34:32 +1000 |
| commit | d627b3bfc829f4ccaad910bf6136eda8af183740 (patch) | |
| tree | 98c06a2796e106148e61f7f49e4a3b770a8121a2 /pkg/gui/files_panel.go | |
| parent | 952c62df37f839004a80fa393f4ddb42683fc41f (diff) | |
more refactoring
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 9d9dfd9a2..2bbe4278e 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -117,14 +117,14 @@ func (gui *Gui) refreshFilesAndSubmodules() error { gui.Log.Error(err) } - if gui.Views.Files.Context == FILES_CONTEXT_KEY { + if ContextKey(gui.Views.Files.Context) == FILES_CONTEXT_KEY { // doing this a little custom (as opposed to using gui.postRefreshUpdate) because we handle selecting the file explicitly below if err := gui.State.Contexts.Files.HandleRender(); err != nil { return err } } - if gui.currentContext().GetKey() == FILES_CONTEXT_KEY || (g.CurrentView() == gui.Views.Main && g.CurrentView().Context == MAIN_MERGING_CONTEXT_KEY) { + if gui.currentContext().GetKey() == FILES_CONTEXT_KEY || (g.CurrentView() == gui.Views.Main && ContextKey(g.CurrentView().Context) == MAIN_MERGING_CONTEXT_KEY) { newSelectedPath := gui.getSelectedPath() alreadySelected := selectedPath != "" && newSelectedPath == selectedPath if err := gui.selectFile(alreadySelected); err != nil { @@ -856,7 +856,7 @@ func (gui *Gui) handleToggleFileTreeView() error { } } - if gui.Views.Files.Context == FILES_CONTEXT_KEY { + if ContextKey(gui.Views.Files.Context) == FILES_CONTEXT_KEY { if err := gui.State.Contexts.Files.HandleRender(); err != nil { return err } |