mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-21 15:30:31 -04:00
* fixed, transfer start when subscribing to channel.
* cleaned up p3distrib callbacks. * added holdQueue for transfer startup in controller. * fixed partial resume. * updated Mac script to only build library. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
71797d6f70
commit
c46b823261
12 changed files with 222 additions and 141 deletions
|
@ -148,7 +148,7 @@ bool ftTransferModule::addFileSource(std::string peerId)
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@ -542,7 +542,7 @@ bool ftTransferModule::locked_tickPeerTransfer(peerInfo &info)
|
|||
return false;
|
||||
}
|
||||
|
||||
if (ageReq > FT_TM_RESTART_DOWNLOAD * (info.nResets + 1))
|
||||
if (ageReq > (int) (FT_TM_RESTART_DOWNLOAD * (info.nResets + 1)))
|
||||
{
|
||||
if (info.nResets > 1) /* 3rd timeout */
|
||||
{
|
||||
|
@ -569,7 +569,7 @@ bool ftTransferModule::locked_tickPeerTransfer(peerInfo &info)
|
|||
}
|
||||
}
|
||||
|
||||
if (ageRecv > FT_TM_DOWNLOAD_TIMEOUT)
|
||||
if (ageRecv > (int) FT_TM_DOWNLOAD_TIMEOUT)
|
||||
{
|
||||
info.state = PQIPEER_IDLE;
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue