aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-21 14:09:35 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-21 14:10:51 +0200
commit8cd900711c0396ac3a96ffd40f43f0e9ec76fadb (patch)
treec334919577ee8b716ec8193b29a49a0a24c4a246 /src
parent6fcdad787f1fb381a3a0fe6b1a1e45477426dccb (diff)
parent305ccaa27551efa33fcaf637e76310654738f428 (diff)
downloadbitcoin-8cd900711c0396ac3a96ffd40f43f0e9ec76fadb.tar.xz
Merge pull request #4204
305ccaa Add missing LOCK(cs_main) (Pieter Wuille)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c54fa65233..a1fe6c07bc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3488,7 +3488,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
return true;
}
- State(pfrom->GetId())->nLastBlockProcess = GetTimeMicros();
+ {
+ LOCK(cs_main);
+ State(pfrom->GetId())->nLastBlockProcess = GetTimeMicros();
+ }