aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoinrpc.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2012-02-16 10:22:31 -0500
committerLuke Dashjr <[email protected]>2012-03-16 16:40:38 -0400
commit27960a36de879634ee8c491d0f4fe8160e8a4f75 (patch)
tree52fff1d5b6a5659de6c111a5fa70c87979ac428d /src/bitcoinrpc.cpp
parentfix default suffixes in save dialog in GNOME, make it more clear that PNG is ... (diff)
downloaddiscoin-27960a36de879634ee8c491d0f4fe8160e8a4f75.tar.xz
discoin-27960a36de879634ee8c491d0f4fe8160e8a4f75.zip
Fix issue #848 : broken mining on testnet
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r--src/bitcoinrpc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 36490e94f..1f57bf9cd 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1654,7 +1654,7 @@ Value getwork(const Array& params, bool fHelp)
}
// Update nTime
- pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+ pblock->UpdateTime(pindexPrev);
pblock->nNonce = 0;
// Update nExtraNonce
@@ -1751,7 +1751,7 @@ Value getmemorypool(const Array& params, bool fHelp)
}
// Update nTime
- pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+ pblock->UpdateTime(pindexPrev);
pblock->nNonce = 0;
Array transactions;