From 703f9dd72a52d4a6841efa918112e58913e3ccfa Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 15 Mar 2010 14:52:50 +0300 Subject: [PATCH] [9585] Restore lost `return` in prev. commit. --- src/game/Group.cpp | 5 +++-- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/game/Group.cpp b/src/game/Group.cpp index a49fbe4d9..c794bb8ce 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -760,11 +760,10 @@ bool Group::CountRollVote(ObjectGuid const& playerGUID, Rolls::iterator& rollI, //called when roll timer expires void Group::EndRoll() { - Rolls::iterator itr; while(!RollId.empty()) { //need more testing here, if rolls disappear - itr = RollId.begin(); + Rolls::iterator itr = RollId.begin(); CountTheRoll(itr); //i don't have to edit player votes, who didn't vote ... he will pass } } @@ -776,7 +775,9 @@ void Group::CountTheRoll(Rolls::iterator& rollI) { rollI = RollId.erase(rollI); delete roll; + return; } + //end of the roll if (roll->totalNeed > 0) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index dbf5e573b..4d15b819b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9584" + #define REVISION_NR "9585" #endif // __REVISION_NR_H__