diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-16 06:02:22 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-16 06:02:22 +0800 |
| commit | d116b9595cf6424293cc94d0dbe78153da860727 (patch) | |
| tree | d855d927424171b258f14598d451c982d9c25736 /cmd | |
| parent | 82c0780f81bef8c88db9dff4bb34917f2934c71d (diff) | |
| parent | 55d85d60fdad2cbd7947d87b2a81bd8df6a18025 (diff) | |
| download | go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.gz go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.tar.zst go-tangerine-d116b9595cf6424293cc94d0dbe78153da860727.zip | |
Merge pull request #989 from obscuren/develop
core, miner: fork resolving and restart miner after sync op
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/admin.go | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |