diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-06 16:39:04 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-06 16:43:18 +0100 |
| commit | 65d0fc4b73104e9f9d2960b1019c1d2365d0458e (patch) | |
| tree | ec955a6dbb95424f769ea9cc15b9b411d8bdc320 /src/qt/walletmodel.cpp | |
| parent | 04f5286096fde1bb85b2dfd72ffc9521ef784080 (diff) | |
| parent | 395d0d5af017bbf6d432471075608efaf4104a03 (diff) | |
| download | bitcoin-65d0fc4b73104e9f9d2960b1019c1d2365d0458e.tar.xz | |
Merge pull request #3145
395d0d5 rework an ugly hack in processPaymentRequest() (Philip Kaufmann)
952d2cd make processPaymentRequest() use a single SendCoinsRecipient (Philip Kaufmann)
983cef4 payment-request UI: use SendCoinsRecipient.message for memo (Philip Kaufmann)
c6c97e0 [Qt] Rework of payment request UI (mainly for insecure pr) (Philip Kaufmann)
Diffstat (limited to 'src/qt/walletmodel.cpp')
| -rw-r--r-- | src/qt/walletmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index d95e718946..1c24ffb20b 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -262,8 +262,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran // and emit coinsSent signal for each recipient foreach(const SendCoinsRecipient &rcp, transaction.getRecipients()) { - // Don't touch the address book when we have a secure payment-request - if (rcp.authenticatedMerchant.isEmpty()) + // Don't touch the address book when we have a payment request + if (!rcp.paymentRequest.IsInitialized()) { std::string strAddress = rcp.address.toStdString(); CTxDestination dest = CBitcoinAddress(strAddress).Get(); |