diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-01-18 19:00:47 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-01-18 19:00:47 +0200 |
| commit | 54eb3318e228ab8229fe0f8166afeff4cdbf7581 (patch) | |
| tree | eea75dbbdb13e6b2c92c668d40d4dd8d3225d7a5 | |
| parent | Merge pull request #5046 (diff) | |
| parent | blockchain: don't propagate exception past dtor (diff) | |
| download | monero-54eb3318e228ab8229fe0f8166afeff4cdbf7581.tar.xz | |
Merge pull request #5048
a67b77a9 blockchain: don't propagate exception past dtor (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 |
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 |