sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround for boost uncaught exception problem on MacOS 10.5.

Browse Source
This commit is contained in:
lotodore
2007-12-07 23:29:49 +00:00
parent a798e051d6
commit 5f0fc7ab93
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/avatarmanager.cpp
+32 -22
View File
@@ -515,30 +515,40 @@ bool
AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars) AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars)
{ {
bool retVal = true; bool retVal = true;
try path tmpPath(dir);
{
// This method is not thread safe. Only call after locking the map.
directory_iterator i(dir);
directory_iterator end;
while (i != end) if (exists(tmpPath) && is_directory(tmpPath))
{
if (is_regular(i->status()))
{
string md5sum(basename(i->path()));
MD5Buf md5buf;
string fileName(i->path().file_string());
if (md5buf.FromString(md5sum))
{
// Only consider files with md5sum as name.
avatars.insert(AvatarMap::value_type(md5buf, fileName));
}
}
++i;
}
} catch (...)
{ {
LOG_ERROR("Exception caught when trying to scan avatar directory."); try
{
// This method is not thread safe. Only call after locking the map.
directory_iterator i(tmpPath);
directory_iterator end;
while (i != end)
{
if (is_regular(i->status()))
{
string md5sum(basename(i->path()));
MD5Buf md5buf;
string fileName(i->path().file_string());
if (md5buf.FromString(md5sum))
{
// Only consider files with md5sum as name.
avatars.insert(AvatarMap::value_type(md5buf, fileName));
}
}
++i;
}
} catch (...)
{
LOG_ERROR("Exception caught when trying to scan avatar directory.");
retVal = false;
}
}
else
{
LOG_ERROR("Avatar directory does not exist.");
retVal = false; retVal = false;
} }
return retVal; return retVal;