Browse Source

Merge #9755: Bugfix: Qt/Options: Restore persistent "restart required" notice

0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
0.14
Jonas Schnelli 8 years ago
parent
commit
a441db01b5
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 5
      src/qt/optionsdialog.cpp

5
src/qt/optionsdialog.cpp

@ -277,6 +277,9 @@ void OptionsDialog::showRestartWarning(bool fPersistent)
void OptionsDialog::clearStatusLabel() void OptionsDialog::clearStatusLabel()
{ {
ui->statusLabel->clear(); ui->statusLabel->clear();
if (model && model->isRestartRequired()) {
showRestartWarning(true);
}
} }
void OptionsDialog::updateProxyValidationState() void OptionsDialog::updateProxyValidationState()
@ -286,7 +289,7 @@ void OptionsDialog::updateProxyValidationState()
if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() || ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() || ui->proxyPortTor->text().toInt() > 0)) if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() || ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() || ui->proxyPortTor->text().toInt() > 0))
{ {
setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid
ui->statusLabel->clear(); clearStatusLabel();
} }
else else
{ {

Loading…
Cancel
Save