diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-07-26 10:43:00 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2011-07-26 10:43:00 -0700 |
| commit | aa7c5e7ceb87d0309349b89c1ad5e388cf6828a4 (patch) | |
| tree | 83715fff9d1c9c428bc1d806316c1aad94578793 /src/ui.cpp | |
| parent | a0eb1d151f60ac49ce30042c7ae4039cf538992d (diff) | |
| parent | b63241d4511896fcd65996ac7d9a5cb935118ca3 (diff) | |
Merge pull request #435 from sipa/fixextract
Bugfix: don't overuse limited ExtractAddress
Diffstat (limited to 'src/ui.cpp')
| -rw-r--r-- | src/ui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui.cpp b/src/ui.cpp index 7d06caaec4..c3c234439c 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -776,6 +776,7 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex) if (pwalletMain->IsMine(txout)) continue; + CBitcoinAddress address; string strAddress; if (!mapValue["to"].empty()) { @@ -785,15 +786,14 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex) else { // Sent to Bitcoin Address - CBitcoinAddress address; - if (ExtractAddress(txout.scriptPubKey, pwalletMain, address)) + if (ExtractAddress(txout.scriptPubKey, NULL, address)) strAddress = address.ToString(); } string strDescription = _("To: "); CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook) - if (pwalletMain->mapAddressBook.count(strAddress) && !pwalletMain->mapAddressBook[strAddress].empty()) - strDescription += pwalletMain->mapAddressBook[strAddress] + " "; + if (pwalletMain->mapAddressBook.count(address) && !pwalletMain->mapAddressBook[address].empty()) + strDescription += pwalletMain->mapAddressBook[address] + " "; strDescription += strAddress; if (!mapValue["message"].empty()) { |