sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

fix race condition when scrolling to merge conflict

Browse Source
This commit is contained in:
Jesse Duffield
2020-05-19 18:01:29 +10:00
parent 003e45d2f5
commit 36ac764133
8 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/gui/tasks_adapter.go
View File

@ -70,6 +70,26 @@ func (gui *Gui) newStringTask(viewName string, str string) error {
return nil
}
func (gui *Gui) newStringTaskWithoutScroll(viewName string, str string) error {
view, err := gui.g.View(viewName)
if err != nil {
return nil // swallowing for now
}
manager := gui.getManager(view)
f := func(stop chan struct{}) error {
gui.setViewContent(view, str)
return nil
}
if err := manager.NewTask(f); err != nil {
return err
}
return nil
}
func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
manager, ok := gui.viewBufferManagerMap[view.Name()]
if !ok {