Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
obscuren committed Jun 29, 2014
2 parents 1b74b98 + 4fc60f3 commit 328ee9a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Empty file modified install.sh
100644 → 100755
Empty file.
4 changes: 4 additions & 0 deletions utils/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 328ee9a

Please sign in to comment.