From 5cec1aad152115502f8ba0d7fcc1c3e40b915d7a Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 15 May 2015 15:30:34 +0200 Subject: core, miner: fork resolving and restart miner after sync op Fork resolving fixes #940 --- miner/miner.go | 1 + 1 file changed, 1 insertion(+) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index 359be4032..6c220b1a6 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -47,6 +47,7 @@ func (self *Miner) update() { atomic.StoreInt32(&self.canStart, 0) if self.Mining() { self.Stop() + atomic.StoreInt32(&self.shouldStart, 1) glog.V(logger.Info).Infoln("Mining operation aborted due to sync operation") } case downloader.DoneEvent, downloader.FailedEvent: -- cgit v1.2.3 From d3e84cc8b4d995b4cec505b1b183b44d55f61453 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 15 May 2015 16:20:50 +0200 Subject: miner: properly check for mining operation on Register --- miner/miner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/miner.go b/miner/miner.go index 6c220b1a6..19d39a605 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -101,7 +101,7 @@ func (self *Miner) Stop() { } func (self *Miner) Register(agent Agent) { - if atomic.LoadInt32(&self.mining) == 0 { + if self.Mining() { agent.Start() } -- cgit v1.2.3