summaryrefslogtreecommitdiffstats
path: root/pkg/gui/patch_options_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-08-23 12:20:49 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-08-23 14:29:18 +1000
commit94601b4dc951de9b1efa08120148d2d9766b637c (patch)
tree0541d8468d78a58f4a2ef069323de475be13d29c /pkg/gui/patch_options_panel.go
parent9ca0073cd7680d2417d4bb0a38a7b02df3dfd651 (diff)
use context to return to the correct view
Diffstat (limited to 'pkg/gui/patch_options_panel.go')
-rw-r--r--pkg/gui/patch_options_panel.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go
index d2e1ba072..419efca23 100644
--- a/pkg/gui/patch_options_panel.go
+++ b/pkg/gui/patch_options_panel.go
@@ -138,10 +138,8 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error {
if len(gui.trackedFiles()) > 0 {
return gui.ask(askOpts{
- returnToView: gui.g.CurrentView(),
- returnFocusOnClose: true,
- title: gui.Tr.SLocalize("MustStashTitle"),
- prompt: gui.Tr.SLocalize("MustStashWarning"),
+ title: gui.Tr.SLocalize("MustStashTitle"),
+ prompt: gui.Tr.SLocalize("MustStashWarning"),
handleConfirm: func() error {
return pull(true)
},