diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 18:10:47 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | cd3874ffb7826099574f2661475ff24298d16a64 (patch) | |
| tree | 2503e86c6ab46f227ff4ca65503c57cad00f1289 /pkg/gui/patch_options_panel.go | |
| parent | 10fe88a2cf79d525f4dfa767b2d0fab1793127e8 (diff) | |
don't let patch manager ever be nil
Diffstat (limited to 'pkg/gui/patch_options_panel.go')
| -rw-r--r-- | pkg/gui/patch_options_panel.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go index a966040e2..748f70365 100644 --- a/pkg/gui/patch_options_panel.go +++ b/pkg/gui/patch_options_panel.go @@ -17,15 +17,14 @@ func (o *patchMenuOption) GetDisplayStrings(isFocused bool) []string { } func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error { - m := gui.GitCommand.PatchManager - if m == nil { + if gui.GitCommand.PatchManager.IsEmpty() { return gui.createErrorPanel(gui.g, gui.Tr.SLocalize("NoPatchError")) } options := []*patchMenuOption{ {displayName: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.CommitSha), function: gui.handleDeletePatchFromCommit}, {displayName: "pull patch out into index", function: gui.handlePullPatchIntoWorkingTree}, - {displayName: "reset patch", function: gui.handleClearPatch}, + {displayName: "reset patch", function: gui.handleResetPatch}, } selectedCommit := gui.getSelectedCommit(gui.g) @@ -122,7 +121,7 @@ func (gui *Gui) handlePullPatchIntoWorkingTree() error { }) } -func (gui *Gui) handleClearPatch() error { - gui.GitCommand.PatchManager = nil +func (gui *Gui) handleResetPatch() error { + gui.GitCommand.PatchManager.Reset() return gui.refreshCommitFilesView() } |