diff options
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) |