From 77d6a6697dffca85dc2bcec62422448b0250ac49 Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Mon, 24 Sep 2018 20:40:23 -0700 Subject: [PATCH] utxonursery: check for quit channel --- utxonursery.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utxonursery.go b/utxonursery.go index d889a3f8..71511ab2 100644 --- a/utxonursery.go +++ b/utxonursery.go @@ -359,6 +359,14 @@ func (u *utxoNursery) IncubateOutputs(chanPoint wire.OutPoint, u.wg.Add(1) defer u.wg.Done() + // Check quit channel for the case where the waitgroup wait was finished + // right before this function's add call was made. + select { + case <-u.quit: + return fmt.Errorf("nursery shutting down") + default: + } + numHtlcs := len(incomingHtlcs) + len(outgoingHtlcs) var ( hasCommit bool