Fix an oddity in PartyWindow

2 files changed, 13 insertions, 3 deletions

diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 9c2d3161..08698dab 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -54,6 +54,16 @@ void PartyWindow::draw(gcn::Graphics *graphics)
     Window::draw(graphics);
 }
 
+PartyMember *PartyWindow::findMember(int id)
+{
+    PartyList::iterator it = mMembers.find(id);
+
+    if (it == mMembers.end())
+        return NULL;
+    else
+        return it->second;
+}
+
 PartyMember *PartyWindow::findMember2(int id)
 {
     PartyMember *member = findMember(id);
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index b1967b0e..60c4da29 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.h
@@ -72,12 +72,12 @@ class PartyWindow : public Window, gcn::ActionListener
         void draw(gcn::Graphics *graphics);
 
         /**
-         * Find a party member based on ID
+         * Find a party member based on ID. Returns NULL if not found.
          */
-        PartyMember *findMember(int id) { return mMembers[id]; }
+        PartyMember *findMember(int id);
 
         /**
-         * Find a party member based on ID. Creates if it doesn't already exist.
+         * Find a party member based on ID. Creates if not found.
          */
         PartyMember *findMember2(int id);