diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-16 16:44:00 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-16 16:44:00 -0400 |
| commit | 78b9d2de40144e6f420518bcdf62168855546ded (patch) | |
| tree | b1f761e093bc60f82c793f3144f226d0d7e666fb /src/main.cpp | |
| parent | 27960a36de879634ee8c491d0f4fe8160e8a4f75 (diff) | |
| parent | 91aadbdacf9a3111da76eb831ea36d6827e1d6fc (diff) | |
| download | bitcoin-78b9d2de40144e6f420518bcdf62168855546ded.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h
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 78a7ec3d27..46e367391f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1959,7 +1959,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // Ask the first connected node for block updates - static int nAskedForBlocks; + static int nAskedForBlocks = 0; if (!pfrom->fClient && (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) && (nAskedForBlocks < 1 || vNodes.size() <= 1)) |