diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 12:20:49 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 94601b4dc951de9b1efa08120148d2d9766b637c (patch) | |
| tree | 0541d8468d78a58f4a2ef069323de475be13d29c /pkg/gui/remote_branches_panel.go | |
| parent | 9ca0073cd7680d2417d4bb0a38a7b02df3dfd651 (diff) | |
use context to return to the correct view
Diffstat (limited to 'pkg/gui/remote_branches_panel.go')
| -rw-r--r-- | pkg/gui/remote_branches_panel.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index 29e199cfc..2e7cbf73c 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -66,10 +66,8 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error { message := fmt.Sprintf("%s '%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.FullName()) return gui.ask(askOpts{ - returnToView: v, - returnFocusOnClose: true, - title: gui.Tr.SLocalize("DeleteRemoteBranch"), - prompt: message, + title: gui.Tr.SLocalize("DeleteRemoteBranch"), + prompt: message, handleConfirm: func() error { return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error { if err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name); err != nil { @@ -100,10 +98,8 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error { ) return gui.ask(askOpts{ - returnToView: v, - returnFocusOnClose: true, - title: gui.Tr.SLocalize("SetUpstreamTitle"), - prompt: message, + title: gui.Tr.SLocalize("SetUpstreamTitle"), + prompt: message, handleConfirm: func() error { if err := gui.GitCommand.SetBranchUpstream(selectedBranch.RemoteName, selectedBranch.Name, checkedOutBranch.Name); err != nil { return err |