go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-26 05:37:18 +02:00
Code Issues Releases Activity

immediately quit when pressing q in diff or filter mode

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-12 20:30:28 +10:00
parent 27cd12e2d9
commit 76e5ec6d45
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/gui/quitting.go
View File

@ -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 { 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") { if gui.Config.GetUserConfig().GetBool("quitOnTopLevelReturn") {
return gui.handleQuit(g, v) return gui.handleQuit(g, v)
} }
@ -46,12 +53,7 @@ func (gui *Gui) quit(v *gocui.View) error {
if gui.State.Updating { if gui.State.Updating {
return gui.createUpdateQuitConfirmation(gui.g, v) return gui.createUpdateQuitConfirmation(gui.g, v)
} }
if gui.inDiffMode() {
return gui.exitDiffMode()
}
if gui.inFilterMode() {
return gui.exitFilterMode()
}
if gui.Config.GetUserConfig().GetBool("confirmOnQuit") { 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 gui.createConfirmationPanel(gui.g, v, true, "", gui.Tr.SLocalize("ConfirmQuit"), func(g *gocui.Gui, v *gocui.View) error {
return gocui.ErrQuit return gocui.ErrQuit