diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 10:50:27 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | fda9f4ea7a476a11d4a50cbbd9ce657fe69ae2cb (patch) | |
| tree | 499299faa4d6a6d59f9b10ad989448d52dddcd28 /pkg/gui/files_panel.go | |
| parent | f876d8fdc82235f75a11a5807f05b4d8b469d521 (diff) | |
centralise logic for rendering options map
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index f9312930c..61f3815fb 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -101,7 +101,7 @@ func (gui *Gui) refreshFiles() error { return err } - if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") { + if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == MAIN_MERGING_CONTEXT_KEY) { newSelectedFile := gui.getSelectedFile() alreadySelected := selectedFile != nil && newSelectedFile != nil && newSelectedFile.Name == selectedFile.Name return gui.selectFile(alreadySelected) |