diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2020-12-23 10:27:57 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2020-12-23 10:34:31 +0900 |
| commit | f37ccaa64f65a2b36e9b82fc946318d60b0c6acc (patch) | |
| tree | 60825e91940bae126e0d73eb973cf5222839da27 | |
| parent | ab3937ee5a62d63bac9307bfe72601eeb4fc9cd2 (diff) | |
Prevent index out of range error
Fix #2293
| -rw-r--r-- | src/terminal.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/terminal.go b/src/terminal.go index 4ddc6bae..ec85ae99 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -2130,7 +2130,8 @@ func (t *Terminal) Loop() { } } toggle := func() bool { - if t.cy < t.merger.Length() && t.toggleItem(t.merger.Get(t.cy).item) { + current := t.currentItem() + if current != nil && t.toggleItem(current) { req(reqInfo) return true } @@ -2241,8 +2242,9 @@ func (t *Terminal) Loop() { case actRefreshPreview: refreshPreview(t.previewOpts.command) case actReplaceQuery: - if t.cy >= 0 && t.cy < t.merger.Length() { - t.input = t.merger.Get(t.cy).item.text.ToRunes() + current := t.currentItem() + if current != nil { + t.input = current.text.ToRunes() t.cx = len(t.input) } case actAbort: |