This commit is contained in:
aozhiwei 2020-09-29 15:04:12 +08:00
parent 1ae4e17262
commit 32a92bb0d0

View File

@ -204,7 +204,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data; ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
cs::SMGuildAgree respmsg; cs::SMGuildAgree respmsg;
GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id()); GuildMember* member = GetMember(msg.apply().base_data().account_id());
if (member) { if (member) {
SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree); SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree);
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
@ -255,7 +255,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
respmsg); respmsg);
member = new GuildMember(); member = new GuildMember();
TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member); TypeConvert::Convert(msg.apply().base_data(), *member);
AddMember(member); AddMember(member);
SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree); SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree);