From 884730ea78cee0c19725344db8651b9f4acd36e3 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 22 Nov 2015 18:36:53 +0100
Subject: [PATCH] Fixed: Crash under Linux (patch by Nimetu), fixes #252

--HG--
branch : develop
---
 code/ryzom/client/src/far_tp.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp
index 5b9b0c836..a7a41c628 100644
--- a/code/ryzom/client/src/far_tp.cpp
+++ b/code/ryzom/client/src/far_tp.cpp
@@ -569,7 +569,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);
@@ -1406,6 +1406,9 @@ void CFarTP::farTPmainLoop()
 {
 	ConnectionReadySent = false;
 	LoginSM.pushEvent(CLoginStateMachine::ev_far_tp_main_loop_entered);
+
+	disconnectFromPreviousShard();
+
 	uint nbRecoSelectCharReceived = 0;
 
 	bool welcomeWindow = true;