Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix global shutdown call from JSON API

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-01-27 23:40:18 +01:00
parent 5dbbe1ffd7
commit 8c9310f754
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/jsonapi/jsonapi.cpp
View file

@ -248,7 +248,13 @@ JsonApiServer::JsonApiServer(): configMutex("JsonApiServer config"),
{
INITIALIZE_API_CALL_JSON_CONTEXT;
DEFAULT_API_CALL_JSON_RETURN(rb::OK);
rsControl->rsGlobalShutDown();
/* Wrap inside RsThread::async because this call
* RsThread::fullstop() also on JSON API server thread.
* Calling RsThread::fullstop() from it's own thread should never
* happen and if it happens an error message is printed
* accordingly by RsThread::fullstop() */
RsThread::async([](){ rsControl->rsGlobalShutDown(); });
} );
}, true);