diff options
| author | Pieter Wuille <[email protected]> | 2012-11-13 23:52:37 +0100 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-16 18:47:41 +0000 |
| commit | 2a333587bdd4d77a96cbcf1166310af4aee7efeb (patch) | |
| tree | 2307f8d087e048283ff7c3e5d3882d35364e6acf /src/rpcwallet.cpp | |
| parent | Update supported translations (diff) | |
| download | discoin-2a333587bdd4d77a96cbcf1166310af4aee7efeb.tar.xz discoin-2a333587bdd4d77a96cbcf1166310af4aee7efeb.zip | |
Prevent RPC 'move' from deadlocking
It seemed to create two CWalletDB objects that both grab the
database lock.
Diffstat (limited to 'src/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 73205102e..65c5523c8 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -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; |