From d5f617ec92ae4ee6fff9675dafbe7a3bd57bf2bd Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 16 Mar 2019 12:48:09 +1100 Subject: show some more errors in the gui rather than panicking --- pkg/gui/files_panel.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/gui/files_panel.go') diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 12aadb0dd..45b3f4dd7 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -361,7 +361,7 @@ func (gui *Gui) editFile(filename string) error { func (gui *Gui) handleFileEdit(g *gocui.Gui, v *gocui.View) error { file, err := gui.getSelectedFile(g) if err != nil { - return err + return gui.createErrorPanel(gui.g, err.Error()) } 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 { file, err := gui.getSelectedFile(g) if err != nil { - return err + return gui.createErrorPanel(gui.g, err.Error()) } 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) if err != nil { if err != gui.Errors.ErrNoFiles { - return err + return gui.createErrorPanel(gui.g, err.Error()) } return nil } -- cgit v1.2.3