From f702e27485981562ed7b88ecd3f8485af4c61b62 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 18 Jul 2014 13:49:52 +0200 Subject: [PATCH] Fixed miner stopping / starting:wq --- utils/cmd.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/cmd.go b/utils/cmd.go index f4d613c2942b..5d0b3463c560 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -247,7 +247,10 @@ func StartMining(ethereum *eth.Ethereum) bool { addr := ethereum.KeyManager().Address() go func() { - miner = ethminer.NewDefaultMiner(addr, ethereum) + if miner == nil { + miner = ethminer.NewDefaultMiner(addr, ethereum) + } + // Give it some time to connect with peers time.Sleep(3 * time.Second) for !ethereum.IsUpToDate() { @@ -255,7 +258,6 @@ func StartMining(ethereum *eth.Ethereum) bool { } logger.Infoln("Miner started") - miner := ethminer.NewDefaultMiner(addr, ethereum) miner.Start() }() RegisterInterrupt(func(os.Signal) { @@ -269,10 +271,14 @@ func StartMining(ethereum *eth.Ethereum) bool { func StopMining(ethereum *eth.Ethereum) bool { if ethereum.Mining && miner != nil { miner.Stop() + logger.Infoln("Miner stopped") + ethereum.Mining = false + return true } + return false }