Merge pull request #1228

2bf65df wallet_api: do not override invalid payment id (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-22 22:18:36 +02:00
commit b3d4505ae1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -360,7 +360,7 @@ std::string WalletImpl::integratedAddress(const std::string &payment_id) const
{
crypto::hash8 pid;
if (!tools::wallet2::parse_short_payment_id(payment_id, pid)) {
pid = crypto::rand<crypto::hash8>();
return "";
}
return m_wallet->get_account().get_public_integrated_address_str(pid, m_wallet->testnet());
}