monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #821

Browse source 
d7bb175 simplewallet: more threading fixes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-04-27 09:09:21 +02:00
commit 5247c063ea
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View file

@ -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) \