diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 09:30:33 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 5638a400076709c85e5d1fff35c29bfbafa22781 (patch) | |
| tree | 97ab8f55befa5048fca225632752117e4572ca7a | |
| parent | d6005dc0eb69d1144e82fc3fbb1fab2f638667b5 (diff) | |
carry more mode state across after returning from subprocess
| -rw-r--r-- | pkg/gui/gui.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 453780573..155197752 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -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{ |