go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

fix bug where cancelling search in menu caused issue

Browse Source
This commit is contained in:
Jesse Duffield
2020-08-26 19:31:49 +10:00
committed by github-actions[bot]
parent 806bee9646
commit 196c83d058
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/gui/searching.go
View File

@ -23,11 +23,16 @@ func (gui *Gui) handleOpenSearch(g *gocui.Gui, v *gocui.View) error {
func (gui *Gui) handleSearch(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleSearch(g *gocui.Gui, v *gocui.View) error {
gui.State.Searching.searchString = gui.getSearchView().Buffer() gui.State.Searching.searchString = gui.getSearchView().Buffer()
if err := gui.switchContextToView(gui.State.Searching.view.Name()); err != nil { if err := gui.returnFromContext(); err != nil {
return err return err
} }
if err := gui.State.Searching.view.Search(gui.State.Searching.searchString); err != nil { view := gui.State.Searching.view
if view == nil {
return nil
}
if err := view.Search(gui.State.Searching.searchString); err != nil {
return err return err
} }
@ -86,9 +91,13 @@ func (gui *Gui) onSearchEscape() error {
} }
func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleSearchEscape(g *gocui.Gui, v *gocui.View) error {
if err := gui.switchContextToView(gui.State.Searching.view.Name()); err != nil { if err := gui.onSearchEscape(); err != nil {
return err return err
} }
return gui.onSearchEscape() if err := gui.returnFromContext(); err != nil {
return err
}
return nil
} }