diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 07c3f546f..77ad579df 100755 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -135,15 +135,15 @@ OverviewPage::OverviewPage(QWidget *parent) : if(fLiteMode){ ui->frameDarksend->setVisible(false); - } else { + } else if(!fMasterNode) { timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); timer->start(333); } - if(fMasterNode || fLiteMode){ + if(fMasterNode){ ui->toggleDarksend->setText("(" + tr("Disabled") + ")"); - ui->toggleDarksend->setEnabled(false); + ui->frameDarksend->setEnabled(false); }else if(!fEnableDarksend){ ui->toggleDarksend->setText(tr("Start Darksend Mixing")); } else { @@ -162,7 +162,7 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index) OverviewPage::~OverviewPage() { - if(!fLiteMode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); + if(!fLiteMode && !fMasterNode) disconnect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); delete ui; } diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 62528d11b..a68d4a008 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -46,6 +46,13 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) : connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked())); connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int))); connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &))); + + // Dash specific + if(fLiteMode) { + ui->checkUseDarksend->setChecked(false); + ui->checkUseDarksend->setVisible(false); + ui->checkInstantX->setVisible(false); + } connect(ui->checkUseDarksend, SIGNAL(stateChanged ( int )), this, SLOT(updateDisplayUnit())); connect(ui->checkInstantX, SIGNAL(stateChanged ( int )), this, SLOT(updateInstantX()));