diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-20 17:29:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-20 17:30:07 +0100 |
| commit | 2dad02232af1456fb298f17cdbc3f8eea96f1a7c (patch) | |
| tree | 271fd58a4ee8d82ccf8b21e8e6d7f677891cc37d /src | |
| parent | 7ca2f542708b664b5add8aec5b5118d324268f0f (diff) | |
| parent | ec1267f13b7d0b9b5058c6821cf8dbf74e02d17c (diff) | |
| download | bitcoin-2dad02232af1456fb298f17cdbc3f8eea96f1a7c.tar.xz | |
Merge #9760: [wallet] Remove importmulti always-true check
ec1267f [wallet] Remove importmulti always-true check (Russell Yanofsky)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcdump.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 30f2414675..e95c71ac8a 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1072,7 +1072,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) } } - if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()) { + if (fRescan && fRunScan && requests.size()) { CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - 7200, 0)) : chainActive.Genesis(); if (pindex) { |