summaryrefslogtreecommitdiffstats
path: root/pkg/gui/status_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-05-19 18:01:29 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-05-19 18:05:14 +1000
commit36ac764133d3837a22619db922bd8d54f4b0938e (patch)
tree0128185188ab95ae95c172ca7f71fb521ecec960 /pkg/gui/status_panel.go
parent003e45d2f5447d1f88e59e2f1edd85effeaae3ae (diff)
fix race condition when scrolling to merge conflict
Diffstat (limited to 'pkg/gui/status_panel.go')
-rw-r--r--pkg/gui/status_panel.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
index 3b5c6dd05..26f3b6d3a 100644
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -42,7 +42,7 @@ func (gui *Gui) refreshStatus() {
status += fmt.Sprintf("%s → %s ", repoName, name)
gui.g.Update(func(*gocui.Gui) error {
- gui.setViewContent(gui.g, gui.getStatusView(), status)
+ gui.setViewContent(gui.getStatusView(), status)
return nil
})
}