From 18cd57a1d15714e832bbaecfca6efe31f9392c9f Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 2 Apr 2016 19:34:20 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/far_tp.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp
index 1c43a0d79..4ecd98df0 100644
--- a/code/ryzom/client/src/far_tp.cpp
+++ b/code/ryzom/client/src/far_tp.cpp
@@ -602,7 +602,7 @@ void CLoginStateMachine::run()
 			break;
 		case st_disconnect:
 			// Far TP part 2: disconnect from the FS and unload shard-specific data (called from farTPmainLoop())
-			// FarTP.disconnectFromPreviousShard();
+			FarTP.disconnectFromPreviousShard();
 
 			SM_BEGIN_EVENT_TABLE
 				SM_EVENT(ev_connect, st_reconnect_fs);
@@ -1439,9 +1439,6 @@ void CFarTP::farTPmainLoop()
 {
 	ConnectionReadySent = false;
 	LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered);
-
-	disconnectFromPreviousShard();
-
 	uint nbRecoSelectCharReceived = 0;
 
 	bool welcomeWindow = true;