rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 22:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6125

Browse Source 
584d057f epee: fix console_handlers_binder race, wait for thread to finish (xiphon)
This commit is contained in:
Alexander Blair 2020-01-16 17:32:15 -08:00
commit fbc15de2cd
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/epee/include/console_handler.h
View File

@ -605,10 +605,17 @@ eof:
std::unique_ptr<boost::thread> m_console_thread;
async_console_handler m_console_handler;
public:
~console_handlers_binder() {
stop_handling();
if (m_console_thread.get() != nullptr)
{
m_console_thread->join();
}
}
bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)
{
m_console_thread.reset(new boost::thread(boost::bind(&console_handlers_binder::run_handling, this, prompt, usage_string, exit_handler)));
m_console_thread->detach();
return true;
}
bool start_handling(const std::string &prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)