From fa634112fbe9e1c73b2fbaf87fd30383d859957e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 11 Dec 2019 14:53:14 +0800 Subject: [PATCH] 1 --- server/wsproxy/mastersvrmgr.cc | 2 +- third_party/a8engine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/wsproxy/mastersvrmgr.cc b/server/wsproxy/mastersvrmgr.cc index 605b7dd..7b84546 100644 --- a/server/wsproxy/mastersvrmgr.cc +++ b/server/wsproxy/mastersvrmgr.cc @@ -116,7 +116,7 @@ void MasterSvrMgr::RequestTargetServer(f8::MsgHdr& hdr, const std::string& team_ param.param2.GetString() }); } - a8::Timer::Instance()->RemoveTimerFunc(a8::Timer::Instance()->GetRunningTimer()); + a8::Timer::Instance()->RemoveTimerAfterFunc(a8::Timer::Instance()->GetRunningTimer()); MasterSvrMgr::Instance()->RemoveRequest( param.param1, param.sender, diff --git a/third_party/a8engine b/third_party/a8engine index cd38d3a..cdb87a3 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit cd38d3a5ff77831d675fd7accd90a38992a294c8 +Subproject commit cdb87a3e673aee3401b3e2ffce3ea1a1e6a603b0