Merge pull request #825 from obscuren/develop

core: chain fork fix

1 files changed, 6 insertions, 0 deletions

diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 60d908758..a3917854f 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -436,6 +436,8 @@ func (d *Downloader) process(peer *peer) error {
 		if err != nil && core.IsParentErr(err) {
 			glog.V(logger.Debug).Infoln("Aborting process due to missing parent.")
 
+			// XXX this needs a lot of attention
+			blocks = nil
 			break
 		} else if err != nil {
 			// immediatly unregister the false peer but do not disconnect
@@ -472,3 +474,7 @@ func (d *Downloader) isProcessing() bool {
 func (d *Downloader) isBusy() bool {
 	return d.isFetchingHashes() || d.isDownloadingBlocks() || d.isProcessing()
 }
+
+func (d *Downloader) IsBusy() bool {
+	return d.isBusy()
+}