From 087373eccff1d651165baeae6ac1b0049faff53f Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Sat, 2 Apr 2016 14:20:51 +0100
Subject: [PATCH] Fix potential race with parallel processing of
 txes/signatures/blocks

---
 src/cryptonote_core/blockchain.cpp | 1 +
 src/wallet/wallet2.cpp             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 34810d98..dd4e9d14 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2159,6 +2159,7 @@ bool Blockchain::check_tx_inputs(const transaction& tx, tx_verification_context
         if(ioservice_active) \
         { \
             work.reset(); \
+            while (!ioservice.stopped()) ioservice.poll(); \
             threadpool.join_all(); \
             ioservice.stop(); \
             ioservice_active = false; \
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index a9a65535..34bbd9fd 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)