Merge pull request #2474 from csoler/v0.6-BugFixing_13

added missing internal change of webUI directory
This commit is contained in:
csoler 2021-09-08 21:08:16 +02:00 committed by GitHub
commit a2a55b06ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -65,6 +65,9 @@ void WebuiPage::selectWebInterfaceDirectory()
return;
whileBlocking(ui.webInterfaceFiles_LE)->setText(dirname);
QString S;
updateParams(S);
}
bool WebuiPage::updateParams(QString &errmsg)
@ -82,6 +85,8 @@ bool WebuiPage::updateParams(QString &errmsg)
// store config
Settings->setWebinterfaceEnabled(ui.enableWebUI_CB->isChecked());
Settings->setWebinterfaceFilesDirectory(ui.webInterfaceFiles_LE->text());
rsWebUi->setHtmlFilesDirectory(ui.webInterfaceFiles_LE->text().toStdString());
}
return ok;
}
@ -196,6 +201,9 @@ void WebuiPage::onApplyClicked()
{
rsWebUi->setUserPassword(ui.password_LE->text().toStdString());
QString errmsg;
updateParams(errmsg);
if(!restart())
{
QMessageBox::warning(0, tr("failed to start Webinterface"), "Failed to start the webinterface.");