Skip to content

Fixes inaccurate round count in CoinControlDialog (Issue #2068) #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 2 commits into from
Jul 16, 2018
Merged

Fixes inaccurate round count in CoinControlDialog (Issue #2068) #2137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c9c040
fixes #2068
Jun 19, 2018
2209630
Revert prior and update in correct location
Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/qt/coincontroldialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
item->setCheckState(COLUMN_CHECKBOX, Qt::Unchecked);
else {
coinControl->Select(outpt);
int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpt);
int nRounds = pwalletMain->GetRealOutpointPrivateSendRounds(outpt);
if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) {
QMessageBox::warning(this, windowTitle(),
tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
Expand Down Expand Up @@ -781,7 +781,7 @@ void CoinControlDialog::updateView()

// PrivateSend rounds
COutPoint outpoint = COutPoint(out.tx->tx->GetHash(), out.i);
int nRounds = pwalletMain->GetCappedOutpointPrivateSendRounds(outpoint);
int nRounds = pwalletMain->GetRealOutpointPrivateSendRounds(outpoint);

if (nRounds >= 0 || fDebug) itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, QString::number(nRounds));
else itemOutput->setText(COLUMN_PRIVATESEND_ROUNDS, tr("n/a"));
Expand Down