Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 03:36:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/settings/WebuiPage.cpp
View file

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