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/qt/transactiondesc.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/qt/transactiondesc.cpp')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 7f4bebb3f..625b8e3f5 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -211,7 +211,7 @@ string TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) { // Offline transaction CBitcoinAddress address; - if (ExtractAddress(txout.scriptPubKey, wallet, address)) + if (ExtractAddress(txout.scriptPubKey, 0, address)) { strHTML += _("<b>To:</b> "); if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty()) |