diff options
| author | Jeffas <dev@jeffas.io> | 2019-07-23 19:41:15 +0100 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-07-25 18:12:08 -0400 |
| commit | ee5b537d538baf38450a2ae655dee53a49aa9824 (patch) | |
| tree | f1b60a518f870198f7a9477f80816f23b8ab588a | |
| parent | 454151922558f2e82cc7f7d935d74940afa0107b (diff) | |
Fix :close on terminal panic
Executing :close on a terminal would panic due to it already having been
removed.
This is also related to the fact that removing a tab doesn't check for
whether it actually found a tab to remove or not.
| -rw-r--r-- | commands/terminal/close.go | 1 | ||||
| -rw-r--r-- | lib/ui/tab.go | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/commands/terminal/close.go b/commands/terminal/close.go index 35c4799..8256e67 100644 --- a/commands/terminal/close.go +++ b/commands/terminal/close.go @@ -26,6 +26,5 @@ func (_ Close) Execute(aerc *widgets.Aerc, args []string) error { } term, _ := aerc.SelectedTab().(*widgets.Terminal) term.Close(nil) - aerc.RemoveTab(term) return nil } diff --git a/lib/ui/tab.go b/lib/ui/tab.go index a9b24a9..6ee5575 100644 --- a/lib/ui/tab.go +++ b/lib/ui/tab.go @@ -57,13 +57,18 @@ func (tabs *Tabs) invalidateChild(d Drawable) { } func (tabs *Tabs) Remove(content Drawable) { + match := false for i, tab := range tabs.Tabs { if tab.Content == content { tabs.Tabs = append(tabs.Tabs[:i], tabs.Tabs[i+1:]...) tabs.removeHistory(i) + match = true break } } + if !match { + return + } index, ok := tabs.popHistory() if ok { tabs.Select(index) |