From 67f1d42a9043dd0dae6938f619a0529681122659 Mon Sep 17 00:00:00 2001
From: hadv <dvietha@gmail.com>
Date: Tue, 9 Jul 2019 12:03:10 +0700
Subject: [PATCH] miner: only commit work when mining

---
 miner/worker.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/miner/worker.go b/miner/worker.go
index 4a9528c395..7efd8ee2a2 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -861,10 +861,10 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
 			return
 		}
 		header.Coinbase = w.coinbase
-	}
-	if err := w.engine.Prepare(w.chain, header); err != nil {
-		log.Error("Failed to prepare header for mining", "err", err)
-		return
+		if err := w.engine.Prepare(w.chain, header); err != nil {
+			log.Error("Failed to prepare header for mining", "err", err)
+			return
+		}
 	}
 	// If we are care about TheDAO hard-fork check whether to override the extra-data or not
 	if daoBlock := w.chainConfig.DAOForkBlock; daoBlock != nil {