Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 14:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed start/stop of webinterface from GUI

Browse source
This commit is contained in:
csoler 2019-11-13 21:06:20 +01:00
parent d19d1685de
commit 9007d266a8
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/settings/JsonApiPage.cc
View file

@ -48,6 +48,7 @@ bool JsonApiPage::updateParams(QString &errmsg)
bool changed = false;
bool enabled = ui.enableCheckBox->isChecked();
if( enabled != Settings->getJsonApiEnabled())
{
Settings->setJsonApiEnabled(enabled);
@ -55,6 +56,7 @@ bool JsonApiPage::updateParams(QString &errmsg)
}
uint16_t port = static_cast<uint16_t>(ui.portSpinBox->value());
if(port != Settings->getJsonApiPort())
{
Settings->setJsonApiPort(port);
@ -106,14 +108,17 @@ QString JsonApiPage::helpText() const { return ""; }
/*static*/ void JsonApiPage::checkShutdownJsonApi()
{
JsonApiServer::instance().shutdown();
if(!JsonApiServer::instance().isRunning())
return;
JsonApiServer::instance().shutdown(); // this is a blocking call until the thread is terminated.
#ifdef SUSPENDED_CODE
/* It is important to make a copy of +jsonApiServer+ pointer so the old
* object can be deleted later, while the original pointer is
* reassigned */
QProgressDialog* pd = new QProgressDialog(
"Stopping JSON API Server", QString(), 0, 3000);
QProgressDialog* pd = new QProgressDialog("Stopping JSON API Server", QString(), 0, 3000);
QTimer* prtm = new QTimer;
prtm->setInterval(16); // 60 FPS
connect( prtm, &QTimer::timeout,
@ -131,6 +136,7 @@ QString JsonApiPage::helpText() const { return ""; }
prtm->deleteLater();
pd->deleteLater();
});
#endif
}
void JsonApiPage::onApplyClicked(bool)