diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-24 14:39:23 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-24 14:39:23 -0500 |
| commit | a16ad1c0f465935d437bd9ae9875b28be49ec65b (patch) | |
| tree | 99166e16a402c3618fbfa32c5578c3c90625950d /src/wallet.h | |
| parent | beabca2be092d0e2a1de26989d4e63a12cce1284 (diff) | |
| parent | ca4cf5cff6fb60c9769b62acce2e3a8fcd0e7aae (diff) | |
| download | bitcoin-a16ad1c0f465935d437bd9ae9875b28be49ec65b.tar.xz | |
Merge pull request #3704 from gavinandresen/wallet_lock_fixes
Wallet locking fixes for -DDEBUG_LOCKORDER
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 95fb0ee9de..eb192f1ca6 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -363,7 +363,7 @@ public: bool SetMaxVersion(int nVersion); // get the current wallet format (the oldest client version guaranteed to understand this wallet) - int GetVersion() { AssertLockHeld(cs_wallet); return nWalletVersion; } + int GetVersion() { LOCK(cs_wallet); return nWalletVersion; } // Get wallet transactions that conflict with given transaction (spend same outputs) std::set<uint256> GetConflicts(const uint256& txid) const; |