From 5b751b6d6df3445fc66d87256bca1f089825f17a Mon Sep 17 00:00:00 2001 From: Ray Ganardi Date: Thu, 16 Apr 2020 19:29:36 +0200 Subject: [PATCH] fix: Close unused MessageView when swapping view Closes https://todo.sr.ht/~sircmpwn/aerc2/379 The old `MessageView` was not closed when replacing the tab content, which causes a memory leak. --- lib/ui/tab.go | 5 +++++ widgets/msgviewer.go | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ui/tab.go b/lib/ui/tab.go index 7d1ce63..4b99e4b 100644 --- a/lib/ui/tab.go +++ b/lib/ui/tab.go @@ -1,6 +1,8 @@ package ui import ( + "io" + "github.com/gdamore/tcell" "github.com/mattn/go-runewidth" @@ -107,6 +109,9 @@ func (tabs *Tabs) Replace(contentSrc Drawable, contentTarget Drawable, name stri if tab.Content == contentSrc { tabs.Tabs[i] = replaceTab tabs.Select(i) + if c, ok := contentSrc.(io.Closer); ok { + c.Close() + } break } } diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 35fc4b6..e192ae6 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -317,8 +317,9 @@ func (mv *MessageViewer) NextPart() { mv.Invalidate() } -func (mv *MessageViewer) Close() { +func (mv *MessageViewer) Close() error { mv.switcher.Cleanup() + return nil } func (ps *PartSwitcher) Invalidate() {