diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 3e36300..6b36218 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -145,7 +145,11 @@ void Guild::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg) GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); - if (!GetMember(forward_msg->context().user_info().base_data().account_id())) { + + GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id()); + if (member) { + + } else { DBHelper::Instance()->AddGuildApply(this, forward_msg->context().user_info()); } } diff --git a/third_party/framework b/third_party/framework index 579efb2..bd30c66 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit 579efb2289bc7391e68875fc58ada395ca1a6e2a +Subproject commit bd30c666bf2a5c909dafe6b458fce62d007d9a56