aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-08-22 21:07:00 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-08-22 21:07:00 -0500
commit510dbf3329ae51bbc6af49a3ef10d1a25afabf8a (patch)
tree88e5a7518f0edb6baee9f0314c7277db34d2ce32
parentMerge pull request #4247 (diff)
parentsimplewallet: Simplify LOCK_IDLE_SCOPE macro (diff)
downloadmonero-510dbf3329ae51bbc6af49a3ef10d1a25afabf8a.tar.xz
Merge pull request #4249
77655b0 simplewallet: Simplify LOCK_IDLE_SCOPE macro (rbrunner7)
-rw-r--r--src/simplewallet/simplewallet.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 139307a90..bdf4212ce 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -95,13 +95,8 @@ typedef cryptonote::simple_wallet sw;
m_auto_refresh_enabled.store(false, std::memory_order_relaxed); \
/* stop any background refresh, and take over */ \
m_wallet->stop(); \
- m_idle_mutex.lock(); \
- while (m_auto_refresh_refreshing) \
- m_idle_cond.notify_one(); \
- m_idle_mutex.unlock(); \
-/* if (auto_refresh_run)*/ \
- /*m_auto_refresh_thread.join();*/ \
boost::unique_lock<boost::mutex> lock(m_idle_mutex); \
+ m_idle_cond.notify_all(); \
epee::misc_utils::auto_scope_leave_caller scope_exit_handler = epee::misc_utils::create_scope_leave_handler([&](){ \
m_auto_refresh_enabled.store(auto_refresh_enabled, std::memory_order_relaxed); \
})