mirror of
https://github.com/monero-project/monero.git
synced 2024-12-14 12:26:31 +02:00
Merge pull request #4547
f2c2c47a
simplewallet: fixed deadlock if a user hits CTRL+C twice (xiphon)
This commit is contained in:
commit
b8a4e5b7a6
@ -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>()*/)
|
||||||
|
Loading…
Reference in New Issue
Block a user