diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-10 19:39:33 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-10 19:39:54 +0100 |
| commit | b93f078496486c6b781d528a1061525f4fabd98f (patch) | |
| tree | 608124d91bbeabf2eaa706eccb21c749aa24ccfd /src | |
| parent | c9da9c4bd83cfd5ffc6ea1a4af42f08a46dfceb1 (diff) | |
| parent | e4eebb604e19f67b0c7a483b1ded1229d75ecdd3 (diff) | |
| download | bitcoin-b93f078496486c6b781d528a1061525f4fabd98f.tar.xz | |
Merge #7502: Update the wallet best block marker when pruning
e4eebb6 Update the wallet best block marker when pruning (Pieter Wuille)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 20539c1ba7..3ad2979b6b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2262,7 +2262,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { return AbortNode(state, "Failed to write to coin database"); nLastFlush = nNow; } - if ((mode == FLUSH_STATE_ALWAYS || mode == FLUSH_STATE_PERIODIC) && nNow > nLastSetChain + (int64_t)DATABASE_WRITE_INTERVAL * 1000000) { + 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()); nLastSetChain = nNow; |