Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keys

ce4080fa · zelig · cf7fcade · 328ee9a3 · ce4080fa · ce4080fa
Commit ce4080fa authored Jun 29, 2014 by zelig
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

install.sh install.sh +0 -0

cmd.go utils/cmd.go +4 -0

No files found.
--- a/install.sh
+++ b/install.sh
--- a/utils/cmd.go
+++ b/utils/cmd.go
@@ -208,6 +208,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()