diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:01:29 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:05:14 +1000 |
| commit | 36ac764133d3837a22619db922bd8d54f4b0938e (patch) | |
| tree | 0128185188ab95ae95c172ca7f71fb521ecec960 /pkg/gui/layout.go | |
| parent | 003e45d2f5447d1f88e59e2f1edd85effeaae3ae (diff) | |
fix race condition when scrolling to merge conflict
Diffstat (limited to 'pkg/gui/layout.go')
| -rw-r--r-- | pkg/gui/layout.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go index f5385e934..09e5f2c89 100644 --- a/pkg/gui/layout.go +++ b/pkg/gui/layout.go @@ -398,7 +398,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { searchPrefixView.BgColor = gocui.ColorDefault searchPrefixView.FgColor = gocui.ColorGreen searchPrefixView.Frame = false - gui.setViewContent(gui.g, searchPrefixView, searchPrefix) + gui.setViewContent(searchPrefixView, searchPrefix) } if searchView, err := g.SetView("search", appStatusOptionsBoundary-1+searchViewOffset+len(searchPrefix), height-2+searchViewOffset, optionsVersionBoundary+searchViewOffset, height+searchViewOffset, 0); err != nil { @@ -440,7 +440,7 @@ func (gui *Gui) layout(g *gocui.Gui) error { } } if gui.State.OldInformation != information { - gui.setViewContent(g, informationView, information) + gui.setViewContent(informationView, information) gui.State.OldInformation = information } |