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

0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
This commit is contained in:
Jonas Schnelli 2017-02-14 15:56:52 +01:00
commit a441db01b5
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC

View File

@ -277,6 +277,9 @@ void OptionsDialog::showRestartWarning(bool fPersistent)
void OptionsDialog::clearStatusLabel()
{
ui->statusLabel->clear();
if (model && model->isRestartRequired()) {
showRestartWarning(true);
}
}
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))
{
setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid
ui->statusLabel->clear();
clearStatusLabel();
}
else
{