aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoriamsmooth <ec2-user@ip-172-31-20-13.ap-northeast-1.compute.internal>2014-09-06 10:35:09 +0000
committerfluffypony <ric@spagni.net>2014-09-06 21:56:34 +0200
commit07680e553fdaec1d05e2e56a97f9dc16a45b4768 (patch)
tree960a769e042ec796edca792e15b6724a654ad3d8 /src
parentcheckpoints on restore; currently fails on 212 checkpoint (diff)
downloadmonero-07680e553fdaec1d05e2e56a97f9dc16a45b4768.tar.xz
bug fix to checkpoint-on-restore; still fails on 612
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/blockchain_storage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp
index 932733c3b..a3c68d64e 100644
--- a/src/cryptonote_core/blockchain_storage.cpp
+++ b/src/cryptonote_core/blockchain_storage.cpp
@@ -96,7 +96,7 @@ bool blockchain_storage::init(const std::string& config_folder)
// mainchain
for (size_t height=0; height < m_blocks.size(); ++height)
{
- CHECK_AND_ASSERT_MES(m_checkpoints.is_in_checkpoint_zone(height) && m_checkpoints.check_block(height,get_block_hash(m_blocks[height].bl)),false,"checkpoint fail, blockchain.bin invalid");
+ CHECK_AND_ASSERT_MES((!m_checkpoints.is_in_checkpoint_zone(height)) || m_checkpoints.check_block(height,get_block_hash(m_blocks[height].bl)),false,"checkpoint fail, blockchain.bin invalid");
}
// check alt chains