_/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

notmuch: manually close notmuch objects

Browse source 
There seems to be some race with the automatic closing that should happen
in theory... close it manually where we can to avoid the issue
This commit is contained in:
Reto Brunner 2020-08-07 09:49:47 +02:00
parent 1023dd9588
commit 7a9fe3824f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
worker/notmuch/lib/database.go
View file

@ -122,10 +122,12 @@ func (db *DB) MsgIDsFromQuery(q string) ([]string, error) {
if err != nil { if err != nil {
return err return err
} }
defer query.Close()
msgs, err := query.Messages() msgs, err := query.Messages()
if err != nil { if err != nil {
return err return err
} }
defer msgs.Close()
var msg *notmuch.Message var msg *notmuch.Message
for msgs.Next(&msg) { for msgs.Next(&msg) {
msgIDs = append(msgIDs, msg.ID()) msgIDs = append(msgIDs, msg.ID())
@ -189,6 +191,7 @@ func (db *DB) MsgTags(key string) ([]string, error) {
} }
defer msg.Close() defer msg.Close()
ts := msg.Tags() ts := msg.Tags()
defer ts.Close()
var tag *notmuch.Tag var tag *notmuch.Tag
for ts.Next(&tag) { for ts.Next(&tag) {
tags = append(tags, tag.Value) tags = append(tags, tag.Value)