From d66930749a9f8eaa19acab78d57585a170f17429 Mon Sep 17 00:00:00 2001 From: Moritz Poldrack Date: Thu, 24 Mar 2022 10:47:34 +0100 Subject: logging: fix race condition in startup If a panic occurs in one of the workers, it can happen after the UI was initialised, but before the cleanup function has been registered. With this the start of the worker loops is deferred until the cleanup routine was registered. Signed-off-by: Moritz Poldrack --- widgets/aerc.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'widgets/aerc.go') diff --git a/widgets/aerc.go b/widgets/aerc.go index c96932c4..db447e47 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -48,8 +48,8 @@ type Choice struct { func NewAerc(conf *config.AercConfig, logger *log.Logger, cmd func(cmd []string) error, complete func(cmd string) []string, - cmdHistory lib.History) *Aerc { - + cmdHistory lib.History, deferLoop chan struct{}, +) *Aerc { tabs := ui.NewTabs(&conf.Ui) statusbar := ui.NewStack(conf.Ui) @@ -85,7 +85,7 @@ func NewAerc(conf *config.AercConfig, logger *log.Logger, conf.Triggers.ExecuteCommand = cmd for i, acct := range conf.Accounts { - view, err := NewAccountView(aerc, conf, &conf.Accounts[i], logger, aerc) + view, err := NewAccountView(aerc, conf, &conf.Accounts[i], logger, aerc, deferLoop) if err != nil { tabs.Add(errorScreen(err.Error(), conf.Ui), acct.Name) } else { -- cgit