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

fixes required by review of pr1700

Browse source
This commit is contained in:
csoler 2019-11-25 22:16:32 +01:00
parent 5223ff751a
commit 7aa51423a4
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
13 changed files with 98 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,35 +122,10 @@ bool JsonApiPage::checkStartJsonApi()
/*static*/ void JsonApiPage::checkShutdownJsonApi()
{
if(RsJsonAPI::JSONAPI_STATUS_RUNNING != rsJsonAPI->status())
if(!rsJsonAPI->isRunning())
return;
rsJsonAPI->stop(); // 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);
QTimer* prtm = new QTimer;
prtm->setInterval(16); // 60 FPS
connect( prtm, &QTimer::timeout,
pd, [=](){pd->setValue(pd->value()+16);} );
pd->show();
prtm->start();
/* Must wait for deletion because stopping of the server is async.
* It is important to capture a copy so it "survive" after
* safeStopJsonApiServer returns */
QTimer::singleShot(3*1000, [=]()
{
prtm->stop();
pd->close();
prtm->deleteLater();
pd->deleteLater();
});
#endif
}
void JsonApiPage::onApplyClicked()