diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-06 15:16:02 +0000 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-06 15:16:02 +0000 |
| commit | ea047307da9e6761f8c55c0dc83ad4bf519269ac (patch) | |
| tree | 8a87a360dc5e9ef12e0b2941bfbe7506a2cbbb64 /src/cryptonote_core | |
| parent | Merge pull request #1846 (diff) | |
| parent | blockchain: don't try to load an empty block hash set (diff) | |
| download | monero-ea047307da9e6761f8c55c0dc83ad4bf519269ac.tar.xz | |
Merge pull request #1848
cfa2564a blockchain: don't try to load an empty block hash set (moneromooo-monero)
38359036 blockchain_import: make --log-level understand categories (moneromooo-monero)
5fee8561 blockchain_export: make --log-level understand categories (moneromooo-monero)
50ebf661 blockchain_import: error out nicely on exceptions (moneromooo-monero)
87d57d9c blockchain_export: error out nicely on exceptions (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index f49050918..0713274a6 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4016,7 +4016,7 @@ void Blockchain::cancel() static const char expected_block_hashes_hash[] = "23d8a8c73de7b2383c72a016d9a6034e69d62dd48077d1c414e064ceab6daa94"; void Blockchain::load_compiled_in_block_hashes() { - if (m_fast_sync && get_blocks_dat_start(m_testnet) != nullptr) + if (m_fast_sync && get_blocks_dat_start(m_testnet) != nullptr && get_blocks_dat_size(m_testnet) > 0) { MINFO("Loading precomputed blocks (" << get_blocks_dat_size(m_testnet) << " bytes)"); |