diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 00:15:39 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-02 11:09:12 +1100 |
| commit | cc9293b38698af48da0c18309fb22eb83b986ceb (patch) | |
| tree | c9e28ec110da1207a1591bca4a0e31448445dab7 /pkg/gui/files_panel.go | |
| parent | efe43077bc6385cf33f328a8382a27cd8663c815 (diff) | |
add mutex to prevent crashes with merge conflicts
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index b9477ea1a..b3c180407 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -73,7 +73,7 @@ func (gui *Gui) selectFile(alreadySelected bool) error { } if node.File != nil && node.File.HasInlineMergeConflicts { - return gui.refreshMergePanel() + return gui.refreshMergePanelWithLock() } cmdStr := gui.GitCommand.WorktreeFileDiffCmdStr(node, false, !node.GetHasUnstagedChanges() && node.GetHasStagedChanges()) |