From 2a2924fb50fb3d7ab29f2ad36b977a0596f0883a Mon Sep 17 00:00:00 2001 From: Warpten Date: Sat, 12 Jan 2013 22:10:47 +0100 Subject: Core/GuildFinder: Fixed a possible crash and a typo. --- src/server/game/Guilds/GuildFinderMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Guilds/GuildFinderMgr.cpp') diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 1f9030b94ae..0e041af402a 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -147,10 +147,9 @@ void GuildFinderMgr::RemoveAllMembershipRequestsFromPlayer(uint32 playerId) break; if (itr2 == itr->second.end()) - return; + continue; SQLTransaction trans = CharacterDatabase.BeginTransaction(); - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_FINDER_APPLICANT); stmt->setUInt32(0, itr2->GetGuildId()); stmt->setUInt32(1, itr2->GetPlayerGUID()); @@ -303,11 +302,12 @@ void GuildFinderMgr::DeleteGuild(uint32 guildId) trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); - _membershipRequests[guildId].erase(itr); // Notify the applicant his submition has been removed if (Player* player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(applicant, 0, HIGHGUID_PLAYER))) SendMembershipRequestListUpdate(*player); + + ++itr; } _membershipRequests.erase(guildId); -- cgit v1.2.3