fix merge conflict panel not rendering

1 files changed, 9 insertions, 2 deletions

diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index a7d64559c..dc4f4675d 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -201,11 +201,18 @@ func (gui *Gui) cleanString(s string) string {
 	return utils.NormalizeLinefeeds(output)
 }
 
-func (gui *Gui) setViewContent(v *gocui.View, s string) {
+func (gui *Gui) setViewContentSync(v *gocui.View, s string) {
 	v.Clear()
 	fmt.Fprint(v, gui.cleanString(s))
 }
 
+func (gui *Gui) setViewContent(v *gocui.View, s string) {
+	gui.g.Update(func(*gocui.Gui) error {
+		gui.setViewContentSync(v, s)
+		return nil
+	})
+}
+
 // renderString resets the origin of a view and sets its content
 func (gui *Gui) renderString(view *gocui.View, s string) {
 	gui.g.Update(func(*gocui.Gui) error {
@@ -220,7 +227,7 @@ func (gui *Gui) renderStringSync(view *gocui.View, s string) error {
 	if err := view.SetCursor(0, 0); err != nil {
 		return err
 	}
-	gui.setViewContent(view, s)
+	gui.setViewContentSync(view, s)
 	return nil
 }