diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-10 16:33:31 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-10 22:32:13 +1100 |
| commit | 131113b0657eea84f842e2c1e24d0ab1150505e5 (patch) | |
| tree | f22c3e0db6ff43655a87bd30aac6f5406ecfab78 /pkg/gui/files_panel.go | |
| parent | e85310c0a92a89167530241bdc3fc5f66a48706d (diff) | |
simplify how the context system works
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 6b8847e8c..ba5c56db2 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -207,10 +207,7 @@ func (gui *Gui) enterFile(forceSecondaryFocused bool, selectedLineIdx int) error if file.HasMergeConflicts { return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("FileStagingRequirements")) } - if err := gui.changeContext("main", "staging"); err != nil { - return err - } - if err := gui.changeContext("secondary", "staging"); err != nil { + if err := gui.changeContext("staging"); err != nil { return err } if err := gui.switchFocus(gui.g, gui.getFilesView(), gui.getMainView()); err != nil { @@ -466,7 +463,7 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error { if !file.HasInlineMergeConflicts { return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons")) } - if err := gui.changeContext("main", "merging"); err != nil { + if err := gui.changeContext("merging"); err != nil { return err } if err := gui.switchFocus(g, v, gui.getMainView()); err != nil { |