update to work with new lock system, add protocol.* to build system

2011-09-02 18:02:22 +02:00
parent 7a15d4ff67
commit c5aa1b139a
11 changed files with 48 additions and 27 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -731,7 +731,7 @@ int64 CWallet::GetBalance() const
 int64 CWallet::GetUnconfirmedBalance() const
 {
    int64 nTotal = 0;
-    CRITICAL_BLOCK(cs_mapWallet)
+    CRITICAL_BLOCK(cs_wallet)
    {
        for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
        {