From dc613359c93fcf18753fe971e460081b53c4888a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 10 Jul 2020 10:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/playermgr.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index 5730b9f..b72bebd 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -467,11 +467,17 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id, if (hdr) { Player* hum = GetPlayerByAccountId(account_id); if (hum) { - abort(); + pending_socket_hash_.erase(hdr->socket_handle); + pending_account_hash_.erase(account_id); + f8::MsgHdr::Destroy(hdr); + return; } hum = GetPlayerBySocket(hdr->socket_handle); if (hum) { - abort(); + pending_socket_hash_.erase(hdr->socket_handle); + pending_account_hash_.erase(account_id); + f8::MsgHdr::Destroy(hdr); + return; } { hum = new Player();