mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
Merge aa61d4feb0 into merged_master (Bitcoin PR bitcoin/bitcoin#30388)
This commit is contained in:
commit
db7e36eaab
1 changed files with 2 additions and 1 deletions
|
|
@ -6289,7 +6289,8 @@ util::Result<void> ChainstateManager::ActivateSnapshot(
|
|||
return util::Error{strprintf(_("The base block header (%s) is part of an invalid chain."), base_blockhash.ToString())};
|
||||
}
|
||||
|
||||
if (Assert(m_active_chainstate->GetMempool())->size() > 0) {
|
||||
auto mempool{m_active_chainstate->GetMempool()};
|
||||
if (mempool && mempool->size() > 0) {
|
||||
return util::Error{_("Can't activate a snapshot when mempool not empty.")};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue