summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/chat-server/guild.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index ca2dd792..46fa6cb9 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -53,8 +53,9 @@ void Guild::removeMember(int playerId)
{
// if the leader is leaving, assign next member as leader
std::list<GuildMember*>::iterator itr = mMembers.begin();
- itr++;
- setLeader((*itr)->mId);
+ ++itr;
+ if (itr != mMembers.end())
+ setLeader((*itr)->mId);
}
GuildMember *member = getMember(playerId);
if (member)