diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-10 15:24:20 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-10 16:18:25 +1100 |
| commit | cd17b46b55e312b3ba4e3ab9d3d96a8eeb20fded (patch) | |
| tree | e35db3d358e3937f5ac960802775ccbdb29581a6 /pkg/gui/patch_building_panel.go | |
| parent | d0d92c7697c311071e2fc4b5cc9fa9278a9c300a (diff) | |
reset patch builder when we've escaped from the building phase and nothing has been added
Diffstat (limited to 'pkg/gui/patch_building_panel.go')
| -rw-r--r-- | pkg/gui/patch_building_panel.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkg/gui/patch_building_panel.go b/pkg/gui/patch_building_panel.go index 26196f6d1..5667b45da 100644 --- a/pkg/gui/patch_building_panel.go +++ b/pkg/gui/patch_building_panel.go @@ -5,7 +5,7 @@ import ( ) func (gui *Gui) refreshPatchBuildingPanel() error { - if gui.GitCommand.PatchManager.IsEmpty() { + if !gui.GitCommand.PatchManager.CommitSelected() { return gui.handleEscapePatchBuildingPanel(gui.g, nil) } @@ -87,11 +87,16 @@ func (gui *Gui) handleEscapePatchBuildingPanel(g *gocui.Gui, v *gocui.View) erro gui.State.Panels.LineByLine = nil gui.State.Contexts["main"] = "normal" + if gui.GitCommand.PatchManager.IsEmpty() { + gui.GitCommand.PatchManager.Reset() + gui.State.SplitMainPanel = false + } + return gui.switchFocus(gui.g, nil, gui.getCommitFilesView()) } func (gui *Gui) refreshSecondaryPatchPanel() error { - if !gui.GitCommand.PatchManager.IsEmpty() { + if gui.GitCommand.PatchManager.CommitSelected() { gui.State.SplitMainPanel = true secondaryView := gui.getSecondaryView() secondaryView.Highlight = true |