diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-07-27 21:44:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-07-27 21:44:55 +0200 |
| commit | b5b1d1a66b9f418c9fb293cb1cc3eac09a711c4e (patch) | |
| tree | 0efbb26069cf36cc64775ba0a50c62a7e7f644aa /src/wallet.cpp | |
| parent | normalize SIGNAL/SLOT signatures (http://marcmutz.wordpress.com/effective-qt/... (diff) | |
| parent | CAddrDB::LoadAddresses: properly initialize CAddress (diff) | |
| download | discoin-b5b1d1a66b9f418c9fb293cb1cc3eac09a711c4e.tar.xz discoin-b5b1d1a66b9f418c9fb293cb1cc3eac09a711c4e.zip | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
src/script.cpp
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 1baf575a5..fcd49e66b 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -437,7 +437,7 @@ void CWalletTx::GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, l { CBitcoinAddress address; vector<unsigned char> vchPubKey; - if (!ExtractAddress(txout.scriptPubKey, pwallet, address)) + if (!ExtractAddress(txout.scriptPubKey, NULL, address)) { printf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", this->GetHash().ToString().c_str()); |