diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 16:52:04 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-15 18:01:43 +1000 |
commit | 17b84e09c0ecedacfb0d0ea9c6cb9f48511f203a (patch) | |
tree | af71ba5dad4e169765dbd7efb4e7a1377edaa159 /pkg/gui/remote_branches_panel.go | |
parent | 43f8bae267e57a8ff642173746f5384d533848a9 (diff) |
fix remote branches select sig
Diffstat (limited to 'pkg/gui/remote_branches_panel.go')
-rw-r--r-- | pkg/gui/remote_branches_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index bc84acd21..2c9ae6b9b 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -19,14 +19,14 @@ func (gui *Gui) getSelectedRemoteBranch() *commands.RemoteBranch { return gui.State.RemoteBranches[selectedLine] } -func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error { +func (gui *Gui) handleRemoteBranchSelect() error { if gui.popupPanelFocused() { return nil } gui.State.SplitMainPanel = false - if _, err := gui.g.SetCurrentView(v.Name()); err != nil { + if _, err := gui.g.SetCurrentView("branches"); err != nil { return err } @@ -37,7 +37,7 @@ func (gui *Gui) handleRemoteBranchSelect(g *gocui.Gui, v *gocui.View) error { return gui.newStringTask("main", "No branches for this remote") } - v.FocusPoint(0, gui.State.Panels.RemoteBranches.SelectedLine) + gui.getBranchesView().FocusPoint(0, gui.State.Panels.RemoteBranches.SelectedLine) if gui.inDiffMode() { return gui.renderDiff() @@ -64,7 +64,7 @@ func (gui *Gui) renderRemoteBranchesWithSelection() error { displayStrings := presentation.GetRemoteBranchListDisplayStrings(gui.State.RemoteBranches, gui.State.Diff.Ref) gui.renderDisplayStrings(branchesView, displayStrings) if gui.g.CurrentView() == branchesView && branchesView.Context == "remote-branches" { - if err := gui.handleRemoteBranchSelect(gui.g, branchesView); err != nil { + if err := gui.handleRemoteBranchSelect(); err != nil { return err } } |