summaryrefslogtreecommitdiffstats
path: root/pkg/gui/files_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-03-16 12:48:09 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-03-16 12:51:48 +1100
commitd5f617ec92ae4ee6fff9675dafbe7a3bd57bf2bd (patch)
tree987b7b671699876a7d7c8bf9bcaabcbaa5c55ce1 /pkg/gui/files_panel.go
parent6d104bfa91c9c3621c770781183872b870bd49c8 (diff)
show some more errors in the gui rather than panicking
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r--pkg/gui/files_panel.go6
1 files changed, 3 insertions, 3 deletions
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
}