aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-11-16 10:09:44 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-11-16 10:09:52 +0100
commit62af16463833076b98ebef4cef2a342835f22617 (patch)
treeca0cff8b7a43e08ae941d6d770efb0864ccf3c44 /src
parent4333b1c4ea74d13d8e6d6ee056be11e9654c73f6 (diff)
parent079142b75771c5b39a76a1eaa6347bce5e99c0b3 (diff)
downloadbitcoin-62af16463833076b98ebef4cef2a342835f22617.tar.xz
Merge #9131: fNetworkActive is not protected by a lock, use an atomic
079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)
Diffstat (limited to 'src')
-rw-r--r--src/net.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.h b/src/net.h
index e2d88b478d..7a32e21f4a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -403,7 +403,7 @@ private:
unsigned int nReceiveFloodSize;
std::vector<ListenSocket> vhListenSocket;
- bool fNetworkActive;
+ std::atomic<bool> fNetworkActive;
banmap_t setBanned;
CCriticalSection cs_setBanned;
bool setBannedIsDirty;