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/wallet.h | |
| 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/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 5e2f8e0ba1..05d60056f4 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; |