diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:09:44 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:09:52 +0100 |
commit | 62af16463833076b98ebef4cef2a342835f22617 (patch) | |
tree | ca0cff8b7a43e08ae941d6d770efb0864ccf3c44 /src | |
parent | 4333b1c4ea74d13d8e6d6ee056be11e9654c73f6 (diff) | |
parent | 079142b75771c5b39a76a1eaa6347bce5e99c0b3 (diff) |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |