From 399d9c974fc36af2234922f001500665a9bfe87f Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Tue, 1 Aug 2017 17:14:01 -0700
Subject: [PATCH] chainntnfs: ensure ntfn cancellation loop will exit

This commit fixes a slight bug introduced. We now ensure that the
cancel loop always exists if the ChainNotifier has been signaled for a
quit.
---
 chainntnfs/btcdnotify/btcd.go         | 2 ++
 chainntnfs/neutrinonotify/neutrino.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/chainntnfs/btcdnotify/btcd.go b/chainntnfs/btcdnotify/btcd.go
index 1afd82ae7..89608cd0e 100644
--- a/chainntnfs/btcdnotify/btcd.go
+++ b/chainntnfs/btcdnotify/btcd.go
@@ -692,6 +692,7 @@ func (b *BtcdNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
 							return
 						}
 					case <-b.quit:
+						return
 					}
 				}
 			case <-b.quit:
@@ -788,6 +789,7 @@ func (b *BtcdNotifier) RegisterBlockEpochNtfn() (*chainntnfs.BlockEpochEvent, er
 								return
 							}
 						case <-b.quit:
+							return
 						}
 					}
 				case <-b.quit:
diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go
index 73484a949..a71db7821 100644
--- a/chainntnfs/neutrinonotify/neutrino.go
+++ b/chainntnfs/neutrinonotify/neutrino.go
@@ -722,6 +722,7 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
 							return
 						}
 					case <-n.quit:
+						return
 					}
 				}
 			case <-n.quit:
@@ -891,6 +892,7 @@ func (n *NeutrinoNotifier) RegisterBlockEpochNtfn() (*chainntnfs.BlockEpochEvent
 								return
 							}
 						case <-n.quit:
+							return
 						}
 					}
 				case <-n.quit: