diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-11-16 08:09:41 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-11-16 08:09:41 -0800 |
| commit | e45d39f9ee9ef776a32d398d973351e7c94f3f38 (patch) | |
| tree | 78bf4b8ec7045bce354f4f1c01ee60a641ad9bc5 /src/rpcwallet.cpp | |
| parent | 1fefd2a5bc8eb3a95c12e260f554c6dcfbb1773c (diff) | |
| parent | 4291e8feab308cb9c7840d74fc7aacf137a7c21f (diff) | |
| download | bitcoin-e45d39f9ee9ef776a32d398d973351e7c94f3f38.tar.xz | |
Merge pull request #2009 from sipa/fixmove
Prevent RPC 'move' from deadlocking
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 29b3298b99..5ebab755b7 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; |