utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 23:56:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

carry more mode state across after returning from subprocess

Browse source
This commit is contained in:
Jesse Duffield 2020-08-23 09:30:33 +10:00
parent d6005dc0eb
commit 5638a40007
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/gui/gui.go
View file

@ -309,22 +309,24 @@ type guiState struct {
func (gui *Gui) resetState() {
// we carry over the filter path and diff state
prevFilterPath := ""
prevFiltering := Filtering{
Path: "",
}
prevDiff := Diffing{}
prevCherryPicking := CherryPicking{
CherryPickedCommits: make([]*commands.Commit, 0),
ContextKey: "",
}
if gui.State != nil {
prevFilterPath = gui.State.Modes.Filtering.Path
prevFiltering = gui.State.Modes.Filtering
prevDiff = gui.State.Modes.Diffing
prevCherryPicking = gui.State.Modes.CherryPicking
}
modes := Modes{
Filtering: Filtering{
Path: prevFilterPath,
},
CherryPicking: CherryPicking{
CherryPickedCommits: make([]*commands.Commit, 0),
ContextKey: "",
},
Diffing: prevDiff,
Filtering: prevFiltering,
CherryPicking: prevCherryPicking,
Diffing: prevDiff,
}
gui.State = &guiState{