1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-19 21:28:28 +02:00

show some more errors in the gui rather than panicking

This commit is contained in:
Jesse Duffield 2019-03-16 12:48:09 +11:00
parent 6d104bfa91
commit d5f617ec92

View File

@ -361,7 +361,7 @@ func (gui *Gui) editFile(filename string) error {
func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
file, err := gui.getSelectedFile(g) file, err := gui.getSelectedFile(g)
if err != nil { if err != nil {
return err return gui.createErrorPanel(gui.g, err.Error())
} }
return gui.editFile(file.Name) return gui.editFile(file.Name)
@ -370,7 +370,7 @@ func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error {
func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
file, err := gui.getSelectedFile(g) file, err := gui.getSelectedFile(g)
if err != nil { if err != nil {
return err return gui.createErrorPanel(gui.g, err.Error())
} }
return gui.openFile(file.Name) return gui.openFile(file.Name)
} }
@ -454,7 +454,7 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error {
file, err := gui.getSelectedFile(g) file, err := gui.getSelectedFile(g)
if err != nil { if err != nil {
if err != gui.Errors.ErrNoFiles { if err != gui.Errors.ErrNoFiles {
return err return gui.createErrorPanel(gui.g, err.Error())
} }
return nil return nil
} }