1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-23 22:24:51 +02:00

avoid deadlock in merge panel

This commit is contained in:
Jesse Duffield
2022-01-15 13:29:28 +11:00
parent cdcfeb396f
commit 8d8bdb948b
9 changed files with 79 additions and 59 deletions

View File

@@ -39,7 +39,7 @@ func (gui *Gui) getMenuOptions() map[string]string {
}
func (gui *Gui) handleMenuClose() error {
return gui.returnFromContextSync()
return gui.returnFromContext()
}
type createMenuOptions struct {