diff options
author | Mark Kopenga <mkopenga@gmail.com> | 2018-08-14 16:38:25 +0200 |
---|---|---|
committer | Mark Kopenga <mkopenga@gmail.com> | 2018-08-14 16:38:25 +0200 |
commit | 38a1a00cf158a9c1fd9c70ec44f932491ab1f26f (patch) | |
tree | e49a3c72812251e5add082127b02fffede5459ad /pkg | |
parent | 9c97b75aad85097c5128a7d599b1297892887928 (diff) |
Fixed comment from myself on issue: 137
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/gui/files_panel.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 6c62240a7..f65dde439 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -13,7 +13,6 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/jesseduffield/lazygit/pkg/i18n" ) func (gui *Gui) stagedFiles() []commands.File { @@ -91,7 +90,7 @@ func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error { return err } gui.SubProcess = sub - return ErrSubProcess + return nil } func (gui *Gui) getSelectedFile(g *gocui.Gui) (commands.File, error) { @@ -188,7 +187,7 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCommitPress(g *gocui.Gui, filesView *gocui.View) error { if len(gui.stagedFiles()) == 0 && !gui.State.HasMergeConflicts { - return gui.createErrorPanel(g, tr.SLocalize("NoStagedFilesCommit", "There are no staged files to commit")) + return gui.createErrorPanel(g, gui.Tr.SLocalize("NoStagedFilesCommit", "There are no staged files to commit")) } commitMessageView := gui.getCommitMessageView(g) g.Update(func(g *gocui.Gui) error { @@ -217,7 +216,7 @@ func (gui *Gui) PrepareSubProcess(g *gocui.Gui, commands ...string) error { } gui.SubProcess = sub g.Update(func(g *gocui.Gui) error { - return ErrSubProcess + return nil }) return nil } @@ -236,7 +235,7 @@ func (gui *Gui) genericFileOpen(g *gocui.Gui, v *gocui.View, open func(string) ( } if sub != nil { gui.SubProcess = sub - return ErrSubProcess + return nil } return nil } |