Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4547 

f2c2c47a simplewallet: fixed deadlock if a user hits CTRL+C twice (xiphon)
This commit is contained in:
Riccardo Spagni 2018-10-26 22:31:36 +02:00
parent d7ff24c1e0 f2c2c47a4b
commit b8a4e5b7a6
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -7050,12 +7050,6 @@ bool simple_wallet::run()
void simple_wallet::stop() void simple_wallet::stop()
{ {
m_cmd_binder.stop_handling(); m_cmd_binder.stop_handling();
m_idle_run.store(false, std::memory_order_relaxed);
m_wallet->stop();
// make the background refresh thread quit
boost::unique_lock<boost::mutex> lock(m_idle_mutex);
m_idle_cond.notify_one();
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::account(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::account(const std::vector<std::string> &args/* = std::vector<std::string>()*/)