From d93c56a35599074eb5538f79eb64dbdcc032ad23 Mon Sep 17 00:00:00 2001 From: drbob Date: Tue, 25 May 2010 20:42:56 +0000 Subject: [PATCH] * Switched on Turtle transfers for Channels, * Enabled srcIds from secondary file transfer requests to be used. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3002 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/ft/ftcontroller.cc | 2 +- libretroshare/src/services/p3channels.cc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc index 5144c8a40..a1016bbf7 100644 --- a/libretroshare/src/ft/ftcontroller.cc +++ b/libretroshare/src/ft/ftcontroller.cc @@ -959,7 +959,7 @@ bool ftController::alreadyHaveFile(const std::string& hash) FileInfo info ; // check for downloads - if(FileDetails(hash, info)) + if(FileDetails(hash, info) && (info.downloadStatus == FT_STATE_COMPLETE)) return true ; // check for file lists diff --git a/libretroshare/src/services/p3channels.cc b/libretroshare/src/services/p3channels.cc index ec0f81df8..af7a5c558 100644 --- a/libretroshare/src/services/p3channels.cc +++ b/libretroshare/src/services/p3channels.cc @@ -501,7 +501,10 @@ bool p3Channels::locked_eventDuplicateMsg(GroupInfo *grp, RsDistribMsg *msg, std uint64_t size = fit->filesize; std::string channelname = grpId; std::string localpath = mChannelsDir + "/" + channelname; - uint32_t flags = RS_FILE_HINTS_EXTRA; + uint32_t flags = RS_FILE_HINTS_EXTRA | + RS_FILE_HINTS_BACKGROUND | + RS_FILE_HINTS_NETWORK_WIDE; + std::list srcIds; srcIds.push_back(id);