diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-11-29 12:38:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-11-29 12:39:33 +0100 |
| commit | 5488514b901d807a98544618cb441a28e0b28bda (patch) | |
| tree | e1db2df3b6573d61e02b516c6fa2157cb6ccdb0f /src/main.cpp | |
| parent | Merge #9224: Prevent FD_SETSIZE error building on OpenBSD (diff) | |
| parent | Fix unlocked access to vNodes.size() (diff) | |
| download | discoin-5488514b901d807a98544618cb441a28e0b28bda.tar.xz discoin-5488514b901d807a98544618cb441a28e0b28bda.zip | |
Merge #9225: Fix some benign races
dfed983 Fix unlocked access to vNodes.size() (Matt Corallo)
3033522 Remove double brackets in addrman (Matt Corallo)
dbfaade Fix AddrMan locking (Matt Corallo)
047ea10 Make fImporting an std::atomic (Matt Corallo)
42071ca Make fDisconnect an std::atomic (Matt Corallo)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 067b39410..452ceac56 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,7 +69,7 @@ int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last CWaitableCriticalSection csBestBlock; CConditionVariable cvBlockChange; int nScriptCheckThreads = 0; -bool fImporting = false; +std::atomic_bool fImporting(false); bool fReindex = false; bool fTxIndex = false; bool fHavePruned = false; |