Merge branch 'master' into develop

11 years ago · 328ee9a3ec
parent 1b74b98f90 4fc60f340f
commit 328ee9a3ec
2 changed files with 4 additions and 0 deletions
--- a/install.sh
+++ b/install.sh
--- a/utils/cmd.go
+++ b/utils/cmd.go
@ -204,6 +204,10 @@ func StartMining(ethereum *eth.Ethereum) bool {
 			miner = ethminer.NewDefaultMiner(addr, ethereum)
 			// Give it some time to connect with peers
 			time.Sleep(3 * time.Second)
 			for !ethereum.IsUpToDate() == false {
 				time.Sleep(5 * time.Second)
 			}
 			logger.Infoln("Miner started")
 			miner := ethminer.NewDefaultMiner(addr, ethereum)
 			miner.Start()