highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-24 22:45:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '293f264' into 0.6.0.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-05-07 04:00:26 +00:00
parent 457ff3a437 293f2644ff
commit 6bcefc1338
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/qt/bitcoin.cpp
View File

@@ -287,6 +287,7 @@ int main(int argc, char *argv[])
#endif
app.exec();
window.hide();
guiref = 0;
}
Shutdown(NULL);

12
src/qt/walletmodel.cpp
View File

@@ -153,14 +153,20 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie
hex = QString::fromStdString(wtx.GetHash().GetHex());
}
// Add addresses that we've sent to to the address book
// Add addresses / update labels that we've sent to to the address book
foreach(const SendCoinsRecipient &rcp, recipients)
{
std::string strAddress = rcp.address.toStdString();
std::string strLabel = rcp.label.toStdString();
CRITICAL_BLOCK(wallet->cs_wallet)
{
if (!wallet->mapAddressBook.count(strAddress))
wallet->SetAddressBookName(strAddress, rcp.label.toStdString());
std::map<CBitcoinAddress, std::string>::iterator mi = wallet->mapAddressBook.find(strAddress);
// Check if we have a new address or an updated label
if (mi == wallet->mapAddressBook.end() || mi->second != strLabel)
{
wallet->SetAddressBookName(strAddress, strLabel);
}
}
}