From 55d85d60fdad2cbd7947d87b2a81bd8df6a18025 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 15 May 2015 16:47:44 +0200
Subject: [PATCH] eth, cmd/geth: start mining from console respects CLI flag

---
 cmd/geth/admin.go | 2 +-
 eth/backend.go    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index 91a336cbb..ebdf3512a 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -288,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value {
 			return otto.FalseValue()
 		}
 	} else {
-		threads = 4
+		threads = int64(js.ethereum.MinerThreads)
 	}
 
 	err = js.ethereum.StartMining(int(threads))
diff --git a/eth/backend.go b/eth/backend.go
index 064018955..a7107f8d8 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -190,6 +190,7 @@ type Ethereum struct {
 	// logger logger.LogSystem
 
 	Mining        bool
+	MinerThreads  int
 	NatSpec       bool
 	DataDir       string
 	etherbase     common.Address
@@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) {
 		ethVersionId:    config.ProtocolVersion,
 		netVersionId:    config.NetworkId,
 		NatSpec:         config.NatSpec,
+		MinerThreads:    config.MinerThreads,
 	}
 
 	eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())