work around for members not being added to their guilds

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a523fe7..5a55470c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-14  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/account-server/dalstorage.cpp: Work around for members not being
+	added to their guilds.
+
 2008-06-10  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/chat-server/chathandler.cpp, src/chat-server/chathandler.hpp,
diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp
index 8f6feb53..21ec171a 100644
--- a/src/account-server/dalstorage.cpp
+++ b/src/account-server/dalstorage.cpp
@@ -993,9 +993,17 @@ std::list<Guild*> DALStorage::getGuildList()
             << " where guild_id = '" << (*itr)->getId() << "';";
             const dal::RecordSet& memberInfo = mDb->execSql(memberSql.str());
 
+            std::list<std::string> names;
             for (unsigned int j = 0; j < memberInfo.rows(); ++j)
             {
-                Character *character = getCharacter(memberInfo(j,0));
+                names.push_back(memberInfo(j, 0));
+            }
+
+            for (std::list<std::string>::const_iterator i = names.begin();
+                 i != names.end();
+                 ++i)
+            {
+                Character *character = getCharacter((*i));
                 if (character)
                 {
                     character->addGuild((*itr)->getName());