diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:14:12 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-03-31 15:14:12 -0500 |
| commit | 6c7d928f19b57e0e26ce580adf105d476a8760f2 (patch) | |
| tree | e8f7e56bd94110bc6038cdb288e6bc6a48298b58 /contrib | |
| parent | Merge pull request #6325 (diff) | |
| parent | tx_pool: catch theoretical error in get_block_reward (diff) | |
| download | monero-6c7d928f19b57e0e26ce580adf105d476a8760f2.tar.xz | |
Merge pull request #6336
760ecf2 console_handler: do not let exception past the dor (moneromooo-monero)
09c8111 threadpool: lock mutex in create (moneromooo-monero)
e377977 tx_pool: catch theoretical error in get_block_reward (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/console_handler.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h index 1b716fca4..a7788aeb8 100644 --- a/contrib/epee/include/console_handler.h +++ b/contrib/epee/include/console_handler.h @@ -606,11 +606,15 @@ eof: async_console_handler m_console_handler; public: ~console_handlers_binder() { - stop_handling(); - if (m_console_thread.get() != nullptr) + try { - m_console_thread->join(); + stop_handling(); + if (m_console_thread.get() != nullptr) + { + m_console_thread->join(); + } } + catch (const std::exception &e) { /* ignore */ } } bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL) |