diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 10:53:14 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 10:53:14 -0400 |
| commit | ccfcdc2e3d51bf2d8ca6505db6434cea12050c43 (patch) | |
| tree | 65cdc0547a88978c7aa38cfceff762af99748d96 /src/main.h | |
| parent | 3eb5fdbf5f73535f6a027bbcdf07958610794749 (diff) | |
| parent | c18b82d5db39bff026f10694a062be2dc7048fd8 (diff) | |
| download | bitcoin-ccfcdc2e3d51bf2d8ca6505db6434cea12050c43.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/protocol.h
src/serialize.h
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index f55f189e4c..4b7e1948fc 100644 --- a/src/main.h +++ b/src/main.h @@ -971,9 +971,10 @@ public: fileout << FLATDATA(pchMessageStart) << nSize; // Write block - nBlockPosRet = ftell(fileout); - if (nBlockPosRet == -1) + long fileOutPos = ftell(fileout); + if (fileOutPos < 0) return error("CBlock::WriteToDisk() : ftell failed"); + nBlockPosRet = fileOutPos; fileout << *this; // Flush stdio buffers and commit to disk before returning |