Merge pull request #1568 from obscuren/issue-1559

core: added a running flag to prevent panics in the chainmanager

1 files changed, 5 insertions, 1 deletions

diff --git a/core/chain_manager.go b/core/chain_manager.go
index 91d1476a8..fc1d1304f 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -76,7 +76,8 @@ type ChainManager struct {
 	cache        *lru.Cache // cache is the LRU caching
 	futureBlocks *lru.Cache // future blocks are blocks added for later processing
 
-	quit chan struct{}
+	quit    chan struct{}
+	running int32 // running must be called automically
 	// procInterrupt must be atomically called
 	procInterrupt int32 // interrupt signaler for block processing
 	wg            sync.WaitGroup
@@ -451,6 +452,9 @@ func (bc *ChainManager) setTotalDifficulty(td *big.Int) {
 }
 
 func (bc *ChainManager) Stop() {
+	if !atomic.CompareAndSwapInt32(&bc.running, 0, 1) {
+		return
+	}
 	close(bc.quit)
 	atomic.StoreInt32(&bc.procInterrupt, 1)