d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6336

Browse source 
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)
This commit is contained in:
luigi1111 2020-03-31 15:14:12 -05:00
commit 6c7d928f19
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
contrib/epee/include/console_handler.h
View file

@ -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)