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

jonasschnelli · jonasschnelli · commit a441db01b527 · 2017-02-14T15:57:02.000+01:00
0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -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
     {

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,9 @@ void OptionsDialog::showRestartWarning(bool fPersistent)`
`277`	`277`	`void OptionsDialog::clearStatusLabel()`
`278`	`278`	`{`
`279`	`279`	`ui->statusLabel->clear();`
	`280`	`+ if (model && model->isRestartRequired()) {`
	`281`	`+ showRestartWarning(true);`
	`282`	`+ }`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`void OptionsDialog::updateProxyValidationState()`
`@@ -286,7 +289,7 @@ void OptionsDialog::updateProxyValidationState()`
`286`	`289`	`if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() \|\| ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() \|\| ui->proxyPortTor->text().toInt() > 0))`
`287`	`290`	`{`
`288`	`291`	`setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid`
`289`		`- ui->statusLabel->clear();`
	`292`	`+ clearStatusLabel();`
`290`	`293`	`}`
`291`	`294`	`else`
`292`	`295`	`{`