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

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

View File

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