Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-11 10:19:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added an test to avodi calling a null ftController in simulation mode

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5639 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-10-04 21:26:32 +00:00
parent 79f067732c
commit 59712222da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/turtle/p3turtle.cc
View File

@ -480,8 +480,9 @@ void p3turtle::autoWash()
// File hashes can only be removed by calling the 'stopMonitoringFileTunnels()' command.
// All calls to _ft_controller are done off-mutex, to avoir cross-lock
for(uint32_t i=0;i<peers_to_remove.size();++i)
_ft_controller->removeFileSource(peers_to_remove[i].first,peers_to_remove[i].second) ;
if(_ft_controller != NULL)
for(uint32_t i=0;i<peers_to_remove.size();++i)
_ft_controller->removeFileSource(peers_to_remove[i].first,peers_to_remove[i].second) ;
}
@ -2067,7 +2068,7 @@ void p3turtle::handleTunnelResult(RsTurtleTunnelOkItem *item)
// notify the file transfer controller for the new file source. This should be done off-mutex
// so we deported this code here.
//
if(new_tunnel)
if(new_tunnel && _ft_controller != NULL)
{
_ft_controller->addFileSource(new_hash,new_vpid) ;
_ft_controller->statusChange(_online_peers) ;