diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-04 17:16:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-04 17:16:56 +0100 |
| commit | 1c4e3f99f05273e4d0fae7246d3afe5a33c52ee0 (patch) | |
| tree | 7dcfec4b6fd774630be21ce5739d969517703205 | |
| parent | 93b7544501d6154f1d6530b670319d72754636ae (diff) | |
| parent | 17115d0a34ce5c370e45fb51560c02bee5339b11 (diff) | |
| download | bitcoin-1c4e3f99f05273e4d0fae7246d3afe5a33c52ee0.tar.xz | |
Merge pull request #5754
17115d0 fix getblocktemplate lock issue (Jonas Schnelli)
| -rw-r--r-- | src/rpcmining.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 369b3fb4d7..8f2d34edff 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -446,10 +446,6 @@ Value getblocktemplate(const Array& params, bool fHelp) } // Release the wallet and main lock while waiting -#ifdef ENABLE_WALLET - if(pwalletMain) - LEAVE_CRITICAL_SECTION(pwalletMain->cs_wallet); -#endif LEAVE_CRITICAL_SECTION(cs_main); { checktxtime = boost::get_system_time() + boost::posix_time::minutes(1); @@ -467,10 +463,6 @@ Value getblocktemplate(const Array& params, bool fHelp) } } ENTER_CRITICAL_SECTION(cs_main); -#ifdef ENABLE_WALLET - if(pwalletMain) - ENTER_CRITICAL_SECTION(pwalletMain->cs_wallet); -#endif if (!IsRPCRunning()) throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Shutting down"); |