From 2a9a6f8a75c1e24fc655d21e45e240b63d747b57 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Thu, 2 Jan 2014 17:13:41 +0000
Subject: [PATCH] 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
---
 libretroshare/src/rsserver/p3face-config.cc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 14c6ff172..70f9dfacb 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -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