diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 21:17:31 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-21 22:07:14 +1100 |
| commit | f905b27b00d827c6745824c5b45c06188313344e (patch) | |
| tree | 0e7b9924add72ae03ece65afdd791c061ba8de0d /pkg/gui/files_panel.go | |
| parent | e36ee0b4f10e43734c61f537322b594a05ad20e5 (diff) | |
couple of things to clean up after rebasing onto master
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 f9983f583..5f68f3fab 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -116,7 +116,7 @@ func (gui *Gui) refreshFiles() error { } fmt.Fprint(filesView, list) - if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && gui.State.Context == "merging") { + if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") { newSelectedFile, _ := gui.getSelectedFile(gui.g) alreadySelected := newSelectedFile.Name == selectedFile.Name return gui.selectFile(alreadySelected) |