From 36ac764133d3837a22619db922bd8d54f4b0938e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 19 May 2020 18:01:29 +1000 Subject: fix race condition when scrolling to merge conflict --- pkg/gui/layout.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/gui/layout.go') 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 } -- cgit v1.2.3