aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-11-13 23:52:37 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2012-11-14 00:31:56 +0100
commit4291e8feab308cb9c7840d74fc7aacf137a7c21f (patch)
treefd2376f4546dfd496dbd8367e5536ee47dae5304 /src/wallet.h
parenteb49457ff279721cc3cef10fe68fd75b4aa71833 (diff)
downloadbitcoin-4291e8feab308cb9c7840d74fc7aacf137a7c21f.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.h2
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;