Merge pull request #821
d7bb175
simplewallet: more threading fixes (moneromooo-monero)
This commit is contained in:
commit
5247c063ea
|
@ -82,8 +82,12 @@ typedef cryptonote::simple_wallet sw;
|
||||||
m_auto_refresh_run.store(false, std::memory_order_relaxed); \
|
m_auto_refresh_run.store(false, std::memory_order_relaxed); \
|
||||||
/* stop any background refresh, and take over */ \
|
/* stop any background refresh, and take over */ \
|
||||||
m_wallet->stop(); \
|
m_wallet->stop(); \
|
||||||
boost::unique_lock<boost::mutex> lock(m_auto_refresh_mutex); \
|
m_auto_refresh_mutex.lock(); \
|
||||||
m_auto_refresh_cond.notify_one(); \
|
m_auto_refresh_cond.notify_one(); \
|
||||||
|
m_auto_refresh_mutex.unlock(); \
|
||||||
|
if (auto_refresh_run) \
|
||||||
|
m_auto_refresh_thread.join(); \
|
||||||
|
boost::unique_lock<boost::mutex> lock(m_auto_refresh_mutex); \
|
||||||
epee::misc_utils::auto_scope_leave_caller scope_exit_handler = epee::misc_utils::create_scope_leave_handler([&](){ \
|
epee::misc_utils::auto_scope_leave_caller scope_exit_handler = epee::misc_utils::create_scope_leave_handler([&](){ \
|
||||||
m_auto_refresh_run.store(auto_refresh_run, std::memory_order_relaxed); \
|
m_auto_refresh_run.store(auto_refresh_run, std::memory_order_relaxed); \
|
||||||
if (auto_refresh_run) \
|
if (auto_refresh_run) \
|
||||||
|
|
Loading…
Reference in New Issue