eth: pull in a lost merge change

Ref: Gustav-Simonsson@21c4c15
ethereum · Apr 20, 2015 · 62ad6dc · 62ad6dc
1 parent a32e799
commit 62ad6dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/eth/backend.go b/eth/backend.go
@@ -198,10 +198,11 @@ func New(config *Config) (*Ethereum, error) {
 	eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State)
 	eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux())
 	eth.chainManager.SetProcessor(eth.blockProcessor)
-	eth.whisper = whisper.New()
-	eth.shhVersionId = int(eth.whisper.Version())
 	eth.miner = miner.New(eth, eth.pow, config.MinerThreads)
-
+	if config.Shh {
+		eth.whisper = whisper.New()
+		eth.shhVersionId = int(eth.whisper.Version())
+	}
 	hasBlock := eth.chainManager.HasBlock
 	insertChain := eth.chainManager.InsertChain
 	td := eth.chainManager.Td()