Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed order of the shutdown to fix a crash of the WebUI plugin.

Browse Source 
First stop the plugins then the other services.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-01-02 17:13:41 +00:00
parent 92fabf4c56
commit 2a9a6f8a75
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/rsserver/p3face-config.cc
View File

@ -82,20 +82,19 @@ void RsServer::rsGlobalShutDown()
// TODO: cache should also clean up old files // TODO: cache should also clean up old files
ConfigFinalSave(); // save configuration before exit ConfigFinalSave(); // save configuration before exit
mPluginsManager->stopPlugins();
mNetMgr->shutdown(); /* Handles UPnP */ mNetMgr->shutdown(); /* Handles UPnP */
join(); join();
ftserver->StopThreads(); ftserver->StopThreads();
mPluginsManager->stopPlugins();
// stop the p3distrib threads // stop the p3distrib threads
mForums->join(); mForums->join();
mChannels->join(); mChannels->join();
#ifdef RS_ENABLE_GXS #ifdef RS_ENABLE_GXS
//if(mGxsCircles) mGxsCircles->join(); //if(mGxsCircles) mGxsCircles->join();
if(mGxsForums) mGxsForums->join(); if(mGxsForums) mGxsForums->join();
@ -107,9 +106,6 @@ void RsServer::rsGlobalShutDown()
if(mWire) mWire->join(); if(mWire) mWire->join();
#endif #endif
#ifdef RS_USE_BLOGS #ifdef RS_USE_BLOGS
mBlogs->join(); mBlogs->join();
#endif #endif