summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-09-17 21:32:19 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-09-17 21:32:19 +1000
commitf89bc10af1f9fb4211badd2fee51e903bbc03f6c (patch)
tree155141e24895a0f5d760cb8d20b26354722ab587
parenta66ac8092e30f6c3f9a72c10a6b3eed5fb2265eb (diff)
appease golangci
-rw-r--r--pkg/gui/files_panel.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 6fd05552f..574e6bc1c 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -185,7 +185,9 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {
gui.renderString(g, "main", gui.Tr.SLocalize("NoChangedFiles"))
return gui.renderfilesOptions(g, nil)
}
- gui.renderfilesOptions(g, file)
+ if err := gui.renderfilesOptions(g, file); err != nil {
+ return err
+ }
var content string
if file.HasMergeConflicts {
return gui.refreshMergePanel(g)