mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-02-11 14:44:28 +00:00
Merge pull request #5754
17115d0 fix getblocktemplate lock issue (Jonas Schnelli)
This commit is contained in:
commit
1c4e3f99f0
@ -446,10 +446,6 @@ Value getblocktemplate(const Array& params, bool fHelp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Release the wallet and main lock while waiting
|
// 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);
|
LEAVE_CRITICAL_SECTION(cs_main);
|
||||||
{
|
{
|
||||||
checktxtime = boost::get_system_time() + boost::posix_time::minutes(1);
|
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);
|
ENTER_CRITICAL_SECTION(cs_main);
|
||||||
#ifdef ENABLE_WALLET
|
|
||||||
if(pwalletMain)
|
|
||||||
ENTER_CRITICAL_SECTION(pwalletMain->cs_wallet);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!IsRPCRunning())
|
if (!IsRPCRunning())
|
||||||
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Shutting down");
|
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Shutting down");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user