dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2009 from sipa/fixmove

Browse Source 
Prevent RPC 'move' from deadlocking
This commit is contained in:
Gavin Andresen
2012-11-16 08:09:41 -08:00
parent 1fefd2a5bc 4291e8feab
commit e45d39f9ee
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpcwallet.cpp
View File

@@ -573,7 +573,7 @@ Value movecmd(const Array& params, bool fHelp)
// Debit
CAccountingEntry debit;
debit.nOrderPos = pwalletMain->IncOrderPosNext();
debit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
debit.strAccount = strFrom;
debit.nCreditDebit = -nAmount;
debit.nTime = nNow;
@@ -583,7 +583,7 @@ Value movecmd(const Array& params, bool fHelp)
// Credit
CAccountingEntry credit;
credit.nOrderPos = pwalletMain->IncOrderPosNext();
credit.nOrderPos = pwalletMain->IncOrderPosNext(&walletdb);
credit.strAccount = strTo;
credit.nCreditDebit = nAmount;
credit.nTime = nNow;