aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2016-11-25 21:52:44 -0800
committerMatt Corallo <git@bluematt.me>2016-11-26 15:42:48 -0800
commit047ea1052d4f20c762b1b75099c8421932021b8a (patch)
treee1630aa6a723ffc27408f2612704c875743f715d /src
parent42071ca2640c6de156d72a32b52bff1020c4a38d (diff)
downloadbitcoin-047ea1052d4f20c762b1b75099c8421932021b8a.tar.xz
Make fImporting an std::atomic
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 05442057e4..d1ff8699e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,7 +68,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;
diff --git a/src/main.h b/src/main.h
index 43c62f6de6..c98ed05726 100644
--- a/src/main.h
+++ b/src/main.h
@@ -165,7 +165,7 @@ extern uint64_t nLastBlockWeight;
extern const std::string strMessageMagic;
extern CWaitableCriticalSection csBestBlock;
extern CConditionVariable cvBlockChange;
-extern bool fImporting;
+extern std::atomic_bool fImporting;
extern bool fReindex;
extern int nScriptCheckThreads;
extern bool fTxIndex;