Merge branch 'develop'

This commit is contained in:
obscuren 2015-05-21 19:53:35 +02:00
commit 13e662f6de

View File

@ -45,6 +45,7 @@ func New(eth core.Backend, mux *event.TypeMux, pow pow.PoW) *Miner {
// and halt your mining operation for as long as the DOS continues. // and halt your mining operation for as long as the DOS continues.
func (self *Miner) update() { func (self *Miner) update() {
events := self.mux.Subscribe(downloader.StartEvent{}, downloader.DoneEvent{}, downloader.FailedEvent{}) events := self.mux.Subscribe(downloader.StartEvent{}, downloader.DoneEvent{}, downloader.FailedEvent{})
out:
for ev := range events.Chan() { for ev := range events.Chan() {
switch ev.(type) { switch ev.(type) {
case downloader.StartEvent: case downloader.StartEvent:
@ -62,11 +63,11 @@ func (self *Miner) update() {
if shouldStart { if shouldStart {
self.Start(self.coinbase, self.threads) self.Start(self.coinbase, self.threads)
} }
// unsubscribe. we're only interested in this event once
events.Unsubscribe()
// stop immediately and ignore all further pending events
break out
} }
// unsubscribe. we're only interested in this event once
events.Unsubscribe()
// stop immediately and ignore all further pending events
break
} }
} }