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/gui.go | |
parent | 9ca0073cd7680d2417d4bb0a38a7b02df3dfd651 (diff) |
use context to return to the correct view
Diffstat (limited to 'pkg/gui/gui.go')
-rw-r--r-- | pkg/gui/gui.go | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index c4d0bdf25..88b146d7c 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -555,12 +555,10 @@ func (gui *Gui) showIntroPopupMessage(done chan struct{}) error { } return gui.ask(askOpts{ - returnToView: nil, - returnFocusOnClose: true, - title: "", - prompt: gui.Tr.SLocalize("IntroPopupMessage"), - handleConfirm: onConfirm, - handleClose: onConfirm, + title: "", + prompt: gui.Tr.SLocalize("IntroPopupMessage"), + handleConfirm: onConfirm, + handleClose: onConfirm, }) } @@ -588,10 +586,8 @@ func (gui *Gui) startBackgroundFetch() { err := gui.fetch(false) if err != nil && strings.Contains(err.Error(), "exit status 128") && isNew { _ = gui.ask(askOpts{ - returnToView: gui.g.CurrentView(), - returnFocusOnClose: true, - title: gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), - prompt: gui.Tr.SLocalize("NoAutomaticGitFetchBody"), + title: gui.Tr.SLocalize("NoAutomaticGitFetchTitle"), + prompt: gui.Tr.SLocalize("NoAutomaticGitFetchBody"), }) } else { gui.goEvery(time.Second*60, gui.stopChan, func() error { |