diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-06-19 17:42:33 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-06-19 17:42:50 +0200 |
| commit | 57539884f2097077c44f0abc13bc46629ab6249b (patch) | |
| tree | a4c2c5dc466029e4d6770d9062b4e21b0b831857 /src/txdb.cpp | |
| parent | Merge pull request #6307 (diff) | |
| parent | rpc: make `gettxoutsettinfo` run lock-free (diff) | |
| download | discoin-57539884f2097077c44f0abc13bc46629ab6249b.tar.xz discoin-57539884f2097077c44f0abc13bc46629ab6249b.zip | |
Merge pull request #6290
57092ed rpc: make `gettxoutsettinfo` run lock-free (Wladimir J. van der Laan)
Diffstat (limited to 'src/txdb.cpp')
| -rw-r--r-- | src/txdb.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/txdb.cpp b/src/txdb.cpp index df9ff8d8c..935b78467 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -147,7 +147,10 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const { return error("%s: Deserialize or I/O error - %s", __func__, e.what()); } } - stats.nHeight = mapBlockIndex.find(GetBestBlock())->second->nHeight; + { + LOCK(cs_main); + stats.nHeight = mapBlockIndex.find(stats.hashBlock)->second->nHeight; + } stats.hashSerialized = ss.GetHash(); stats.nTotalAmount = nTotalAmount; return true; |