From dd5b6394d92921088357f6e21e917bf4ac675996 Mon Sep 17 00:00:00 2001
From: Wilmer Paulino <wilmer.paulino@gmail.com>
Date: Mon, 6 Aug 2018 18:14:53 -0700
Subject: [PATCH] autopilot: read quit chan when sending state updates

---
 autopilot/agent.go | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/autopilot/agent.go b/autopilot/agent.go
index da69a935..b2450523 100644
--- a/autopilot/agent.go
+++ b/autopilot/agent.go
@@ -206,9 +206,13 @@ type chanCloseUpdate struct {
 // OnBalanceChange is a callback that should be executed each time the balance of
 // the backing wallet changes.
 func (a *Agent) OnBalanceChange(delta btcutil.Amount) {
+	a.wg.Add(1)
 	go func() {
-		a.stateUpdates <- &balanceUpdate{
-			balanceDelta: delta,
+		defer a.wg.Done()
+
+		select {
+		case a.stateUpdates <- &balanceUpdate{balanceDelta: delta}:
+		case <-a.quit:
 		}
 	}()
 }
@@ -216,9 +220,13 @@ func (a *Agent) OnBalanceChange(delta btcutil.Amount) {
 // OnChannelOpen is a callback that should be executed each time a new channel
 // is manually opened by the user or any system outside the autopilot agent.
 func (a *Agent) OnChannelOpen(c Channel) {
+	a.wg.Add(1)
 	go func() {
-		a.stateUpdates <- &chanOpenUpdate{
-			newChan: c,
+		defer a.wg.Done()
+
+		select {
+		case a.stateUpdates <- &chanOpenUpdate{newChan: c}:
+		case <-a.quit:
 		}
 	}()
 }
@@ -227,8 +235,14 @@ func (a *Agent) OnChannelOpen(c Channel) {
 // autopilot has attempted to open a channel, but failed. In this case we can
 // retry channel creation with a different node.
 func (a *Agent) OnChannelOpenFailure() {
+	a.wg.Add(1)
 	go func() {
-		a.stateUpdates <- &chanOpenFailureUpdate{}
+		defer a.wg.Done()
+
+		select {
+		case a.stateUpdates <- &chanOpenFailureUpdate{}:
+		case <-a.quit:
+		}
 	}()
 }
 
@@ -236,9 +250,13 @@ func (a *Agent) OnChannelOpenFailure() {
 // channel has been closed for any reason. This includes regular
 // closes, force closes, and channel breaches.
 func (a *Agent) OnChannelClose(closedChans ...lnwire.ShortChannelID) {
+	a.wg.Add(1)
 	go func() {
-		a.stateUpdates <- &chanCloseUpdate{
-			closedChans: closedChans,
+		defer a.wg.Done()
+
+		select {
+		case a.stateUpdates <- &chanCloseUpdate{closedChans: closedChans}:
+		case <-a.quit:
 		}
 	}()
 }