only try to set best chain if signal is registered

instagibbs · instagibbs · commit ea9d92d45345 · 2018-09-26T12:09:57.000-04:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3036,7 +3036,9 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int n
     }
     if (fDoFullFlush || ((mode == FLUSH_STATE_ALWAYS || mode == FLUSH_STATE_PERIODIC) && nNow > nLastSetChain + (int64_t)DATABASE_WRITE_INTERVAL * 1000000)) {
         // Update best block in wallet (so we can detect restored wallets).
-        GetMainSignals().SetBestChain(chainActive.GetLocator());
+        if (!GetMainSignals().SetBestChain.empty()) {
+            GetMainSignals().SetBestChain(chainActive.GetLocator());
+        }
         nLastSetChain = nNow;
     }
     } catch (const std::runtime_error& e) {

Original file line number	Diff line number	Diff line change
`@@ -3036,7 +3036,9 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int n`
`3036`	`3036`	`}`
`3037`	`3037`	`if (fDoFullFlush \|\| ((mode == FLUSH_STATE_ALWAYS \|\| mode == FLUSH_STATE_PERIODIC) && nNow > nLastSetChain + (int64_t)DATABASE_WRITE_INTERVAL * 1000000)) {`
`3038`	`3038`	`// Update best block in wallet (so we can detect restored wallets).`
`3039`		`- GetMainSignals().SetBestChain(chainActive.GetLocator());`
	`3039`	`+ if (!GetMainSignals().SetBestChain.empty()) {`
	`3040`	`+ GetMainSignals().SetBestChain(chainActive.GetLocator());`
	`3041`	`+ }`
`3040`	`3042`	`nLastSetChain = nNow;`
`3041`	`3043`	`}`
`3042`	`3044`	`} catch (const std::runtime_error& e) {`