From a327ac02e5365cca713bd3bc256ee3658a39937b Mon Sep 17 00:00:00 2001 From: lotodore Date: Thu, 5 Jan 2012 19:59:35 +0000 Subject: [PATCH] Fixing login error when uploading an avatar. --- src/net/common/serverlobbythread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index cd6ddd4e..e76505e4 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1491,7 +1491,7 @@ ServerLobbyThread::EstablishSession(boost::shared_ptr session) } else { // Check whether this player is already connected. unsigned previousPlayerId = GetPlayerId(session->GetPlayerData()->GetName()); - if (previousPlayerId != 0) { + if (previousPlayerId != 0 && previousPlayerId != session->GetPlayerData()->GetUniqueId()) { #ifdef POKERTH_OFFICIAL_SERVER // If so, and this is a login server, disconnect the already connected player. InternalRemovePlayer(previousPlayerId, ERR_NET_PLAYER_NAME_IN_USE);