Merge pull request #4467

1f740dd Remove unused variable (R E Broadley)
This commit is contained in:
Wladimir J. van der Laan 2014-07-07 10:02:58 +02:00
commit 4ea8f632fe
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -523,9 +523,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
dPriority = dPriorityInputs / (nBytes - nBytesInputs + (nQuantityUncompressed * 29)); // 29 = 180 - 151 (uncompressed public keys are over the limit. max 151 bytes of the input are ignored for priority)
sPriorityLabel = CoinControlDialog::getPriorityLabel(mempool, dPriority);
// Fee
int64_t nFee = payTxFee.GetFee(max((unsigned int)1000, nBytes));
// Min Fee
nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, mempool);