mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 03:22:34 -04:00
Possibly got rid of this core dump in file uploads. It seems it came from unlocked destroying of dataplex->mServers when they came out of time, while the gui still asked for info about them.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
9602f07760
commit
98911955d5
3 changed files with 21 additions and 12 deletions
|
@ -203,18 +203,9 @@ void ftServer::run()
|
|||
}
|
||||
}
|
||||
|
||||
std::list<std::string>::iterator it;
|
||||
for (it = toDels.begin();it != toDels.end(); it++)
|
||||
{
|
||||
sit = mFtDataplex->mServers.find(*it);
|
||||
|
||||
if(mFtDataplex->mServers.end() != sit)
|
||||
{
|
||||
delete sit->second;
|
||||
mFtDataplex->mServers.erase(sit);
|
||||
}
|
||||
}
|
||||
|
||||
if(!toDels.empty())
|
||||
mFtDataplex->deleteServers(toDels) ;
|
||||
|
||||
#ifdef WIN32
|
||||
Sleep(1000);
|
||||
#else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue