diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-11-13 23:52:37 +0100 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 18:47:41 +0000 |
| commit | 2a333587bdd4d77a96cbcf1166310af4aee7efeb (patch) | |
| tree | 2307f8d087e048283ff7c3e5d3882d35364e6acf /src/wallet.h | |
| parent | acbdc055603905d3a9221662799e6b29df4bc1af (diff) | |
| download | bitcoin-2a333587bdd4d77a96cbcf1166310af4aee7efeb.tar.xz | |
Prevent RPC 'move' from deadlocking
It seemed to create two CWalletDB objects that both grab the
database lock.
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index c5f1243907..5c312ef5eb 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -149,7 +149,7 @@ public: /** Increment the next transaction order id @return next transaction order id */ - int64 IncOrderPosNext(); + int64 IncOrderPosNext(CWalletDB *pwalletdb = NULL); typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair; typedef std::multimap<int64, TxPair > TxItems; |