aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-03-12 16:25:35 +0200
committerRiccardo Spagni <ric@spagni.net>2016-03-12 16:25:35 +0200
commitdd3cd9e7b80778cf7a752dcea6ecc62f28b57e82 (patch)
tree86ad1e3f60d7030d379582b1e90d45b5e1b5528f /src
parentMerge pull request #717 (diff)
parentsimplewallet: fix hang when setting auto-refresh to 0 (diff)
downloadmonero-dd3cd9e7b80778cf7a752dcea6ecc62f28b57e82.tar.xz
Merge pull request #718
41ea91a simplewallet: fix hang when setting auto-refresh to 0 (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/simplewallet/simplewallet.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 04201c37e..73b56f2b7 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -450,6 +450,7 @@ bool simple_wallet::set_auto_refresh(const std::vector<std::string> &args/* = st
else if (!auto_refresh && m_auto_refresh_run.load(std::memory_order_relaxed))
{
m_auto_refresh_run.store(false, std::memory_order_relaxed);
+ m_wallet->stop();
m_auto_refresh_thread.join();
}