From c0e627c2c7de615d51e4907258830e31311f7e06 Mon Sep 17 00:00:00 2001
From: David Athay <ko2fan@gmail.com>
Date: Thu, 27 Nov 2008 15:50:33 +0000
Subject: Fixed bug found by b_lindeijer

---
 src/chat-server/guild.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/chat-server/guild.cpp')

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)
-- 
cgit v1.2.3-60-g2f50