diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-27 20:10:25 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-27 21:25:04 +1100 |
| commit | 84a19920559f940b391ab3f19686e2e85039e083 (patch) | |
| tree | 479b356263b51bd93831c8e98f479d9b8b722a2c /pkg/gui/context_config.go | |
| parent | 7f85bf556322eb5996b63182bbf775db68987bae (diff) | |
better locking of merge panel state
Diffstat (limited to 'pkg/gui/context_config.go')
| -rw-r--r-- | pkg/gui/context_config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/context_config.go b/pkg/gui/context_config.go index 2a152e517..f567f5a5c 100644 --- a/pkg/gui/context_config.go +++ b/pkg/gui/context_config.go @@ -167,7 +167,7 @@ func (gui *Gui) contextTree() ContextTree { Key: MAIN_PATCH_BUILDING_CONTEXT_KEY, }, Merging: &BasicContext{ - OnFocus: OnFocusWrapper(gui.renderConflictsWithFocus), + OnFocus: OnFocusWrapper(func() error { return gui.renderConflictsWithLock(true) }), Kind: MAIN_CONTEXT, ViewName: "main", Key: MAIN_MERGING_CONTEXT_KEY, |