From 33cdfdaed7ee23d9f6b541b9548b60bf847133e4 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Sat, 28 Jan 2012 11:23:26 +0000
Subject: [PATCH] Fixing rejoin for non-official server.

---
 src/net/common/clientstate.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
index 1469bc37..2b60d5a0 100644
--- a/src/net/common/clientstate.cpp
+++ b/src/net/common/clientstate.cpp
@@ -844,6 +844,13 @@ ClientStateStartSession::InternalHandlePacket(boost::shared_ptr<ClientThread> cl
 			InitMessage_t *netInit = &init->GetMsg()->choice.initMessage;
 			netInit->requestedVersion.major = NET_VERSION_MAJOR;
 			netInit->requestedVersion.minor = NET_VERSION_MINOR;
+			if (!context.GetSessionGuid().empty()) {
+				netInit->myLastSessionId =
+					OCTET_STRING_new_fromBuf(
+						&asn_DEF_OCTET_STRING,
+						context.GetSessionGuid().c_str(),
+						(int)context.GetSessionGuid().length());
+			}
 			if (!context.GetServerPassword().empty()) {
 				netInit->authServerPassword =
 					OCTET_STRING_new_fromBuf(