Merge pull request #3069 from Diapolo/fix_addressbook

don't touch addressbook when using secure payment-requests

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,
     // 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())
         {
             std::string strAddress = rcp.address.toStdString();
             CTxDestination dest = CBitcoinAddress(strAddress).Get();
@@ -276,6 +279,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
                     wallet->SetAddressBook(dest, strLabel, ""); // "" means don't change purpose
                 }
             }
+        }
         emit coinsSent(wallet, rcp, transaction_array);
     }