Browse Source

don't touch addressbook when using secure payment-requests

- fixes #3006 by preventing addressbook changes when using
  secure payment-requests

sq
0.10
Philip Kaufmann 11 years ago
parent
commit
48c011489b
  1. 4
      src/qt/walletmodel.cpp

4
src/qt/walletmodel.cpp

@ -257,6 +257,9 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
// Add addresses / update labels that we've sent to to the address book, // Add addresses / update labels that we've sent to to the address book,
// and emit coinsSent signal for each recipient // and emit coinsSent signal for each recipient
foreach(const SendCoinsRecipient &rcp, transaction.getRecipients()) foreach(const SendCoinsRecipient &rcp, transaction.getRecipients())
{
// Don't touch the address book when we have a secure payment-request
if (rcp.authenticatedMerchant.isEmpty())
{ {
std::string strAddress = rcp.address.toStdString(); std::string strAddress = rcp.address.toStdString();
CTxDestination dest = CBitcoinAddress(strAddress).Get(); CTxDestination dest = CBitcoinAddress(strAddress).Get();
@ -276,6 +279,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
wallet->SetAddressBook(dest, strLabel, ""); // "" means don't change purpose wallet->SetAddressBook(dest, strLabel, ""); // "" means don't change purpose
} }
} }
}
emit coinsSent(wallet, rcp, transaction_array); emit coinsSent(wallet, rcp, transaction_array);
} }

Loading…
Cancel
Save