diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:31:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:31:37 +0200 |
| commit | b8a4e5b7a6c03dfef510643cc94487e839b26e20 (patch) | |
| tree | f5a807c330274bb87b5155646d685fd06f1ba201 | |
| parent | Merge pull request #4545 (diff) | |
| parent | simplewallet: fixed deadlock if a user hits CTRL+C twice (diff) | |
| download | monero-b8a4e5b7a6c03dfef510643cc94487e839b26e20.tar.xz | |
Merge pull request #4547
f2c2c47a simplewallet: fixed deadlock if a user hits CTRL+C twice (xiphon)
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 18b596662..4128a2789 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -7050,12 +7050,6 @@ bool simple_wallet::run() void simple_wallet::stop() { 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>()*/) |