summaryrefslogtreecommitdiff
path: root/widgets/account.go
diff options
context:
space:
mode:
authorMoritz Poldrack <git@moritz.sh>2022-03-24 10:47:34 +0100
committerRobin Jarry <robin@jarry.cc>2022-03-24 12:37:53 +0100
commitd66930749a9f8eaa19acab78d57585a170f17429 (patch)
tree92b66d6777db51772da654403fc36a4939c2c2c1 /widgets/account.go
parent98c9d7bb780a2b8bd3b477f2d530047adf9e2e28 (diff)
downloadaerc-d66930749a9f8eaa19acab78d57585a170f17429.zip
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 <git@moritz.sh>
Diffstat (limited to 'widgets/account.go')
-rw-r--r--widgets/account.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/widgets/account.go b/widgets/account.go
index 55c4f55..3bf104b 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -47,8 +47,8 @@ func (acct *AccountView) UiConfig() config.UIConfig {
}
func NewAccountView(aerc *Aerc, conf *config.AercConfig, acct *config.AccountConfig,
- logger *log.Logger, host TabHost) (*AccountView, error) {
-
+ logger *log.Logger, host TabHost, deferLoop chan struct{},
+) (*AccountView, error) {
acctUiConf := conf.GetUiConfig(map[config.ContextType]string{
config.UI_CONTEXT_ACCOUNT: acct.Name,
})
@@ -90,6 +90,10 @@ func NewAccountView(aerc *Aerc, conf *config.AercConfig, acct *config.AccountCon
go func() {
defer logging.PanicHandler()
+ if deferLoop != nil {
+ <-deferLoop
+ }
+
worker.Backend.Run()
}()