diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 20:30:28 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 20:44:29 +1000 |
commit | 76e5ec6d4571251bc89eb015062c747f45a55edd (patch) | |
tree | ee89c53a24d655d3741b541c78b725034a0a319f /pkg/gui/quitting.go | |
parent | 27cd12e2d917aadcd5b023f4fce8d8248c491c8c (diff) |
immediately quit when pressing q in diff or filter mode
Diffstat (limited to 'pkg/gui/quitting.go')
-rw-r--r-- | pkg/gui/quitting.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkg/gui/quitting.go b/pkg/gui/quitting.go index 4a7bba23a..b6cd57e23 100644 --- a/pkg/gui/quitting.go +++ b/pkg/gui/quitting.go @@ -35,6 +35,13 @@ func (gui *Gui) handleQuit(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleTopLevelReturn(g *gocui.Gui, v *gocui.View) error { + if gui.inDiffMode() { + return gui.exitDiffMode() + } + if gui.inFilterMode() { + return gui.exitFilterMode() + } + if gui.Config.GetUserConfig().GetBool("quitOnTopLevelReturn") { return gui.handleQuit(g, v) } @@ -46,12 +53,7 @@ func (gui *Gui) quit(v *gocui.View) error { if gui.State.Updating { return gui.createUpdateQuitConfirmation(gui.g, v) } - if gui.inDiffMode() { - return gui.exitDiffMode() - } - if gui.inFilterMode() { - return gui.exitFilterMode() - } + if gui.Config.GetUserConfig().GetBool("confirmOnQuit") { return gui.createConfirmationPanel(gui.g, v, true, "", gui.Tr.SLocalize("ConfirmQuit"), func(g *gocui.Gui, v *gocui.View) error { return gocui.ErrQuit |