aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-04-02 14:20:51 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-04-02 14:20:51 +0100
commit087373eccff1d651165baeae6ac1b0049faff53f (patch)
tree7665d0bdd32258f9848f206815537acb8e5ac92f /src/wallet/wallet2.cpp
parentMerge pull request #780 (diff)
downloadmonero-087373eccff1d651165baeae6ac1b0049faff53f.tar.xz
Fix potential race with parallel processing of txes/signatures/blocks
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index a9a65535f..34bbd9fd2 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -73,6 +73,7 @@ using namespace cryptonote;
#define KILL_IOSERVICE() \
do { \
work.reset(); \
+ while (!ioservice.stopped()) ioservice.poll(); \
threadpool.join_all(); \
ioservice.stop(); \
} while(0)