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/patch_building_panel.go | |
| parent | 003e45d2f5447d1f88e59e2f1edd85effeaae3ae (diff) | |
fix race condition when scrolling to merge conflict
Diffstat (limited to 'pkg/gui/patch_building_panel.go')
| -rw-r--r-- | pkg/gui/patch_building_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/patch_building_panel.go b/pkg/gui/patch_building_panel.go index 3e32386ec..def631d47 100644 --- a/pkg/gui/patch_building_panel.go +++ b/pkg/gui/patch_building_panel.go @@ -94,7 +94,7 @@ func (gui *Gui) refreshSecondaryPatchPanel() error { secondaryView.Wrap = false gui.g.Update(func(*gocui.Gui) error { - gui.setViewContent(gui.g, gui.getSecondaryView(), gui.GitCommand.PatchManager.RenderAggregatedPatchColored(false)) + gui.setViewContent(gui.getSecondaryView(), gui.GitCommand.PatchManager.RenderAggregatedPatchColored(false)) return nil }) } else { |