aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-01-18 19:00:47 +0200
committerRiccardo Spagni <ric@spagni.net>2019-01-18 19:00:47 +0200
commit54eb3318e228ab8229fe0f8166afeff4cdbf7581 (patch)
treeeea75dbbdb13e6b2c92c668d40d4dd8d3225d7a5 /src
parentMerge pull request #5046 (diff)
parentblockchain: don't propagate exception past dtor (diff)
downloadmonero-54eb3318e228ab8229fe0f8166afeff4cdbf7581.tar.xz
Merge pull request #5048
a67b77a9 blockchain: don't propagate exception past dtor (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/blockchain.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index d8163721e..a108124a8 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -173,7 +173,8 @@ Blockchain::Blockchain(tx_memory_pool& tx_pool) :
//------------------------------------------------------------------
Blockchain::~Blockchain()
{
- deinit();
+ try { deinit(); }
+ catch (const std::exception &e) { /* ignore */ }
}
//------------------------------------------------------------------
bool Blockchain::have_tx(const crypto::hash &id) const