mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 19:12:28 -04:00
roll back to 725
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e8d21abdd5
commit
cc41cbb708
2 changed files with 11 additions and 7 deletions
|
@ -122,7 +122,7 @@ void ftController::checkDownloadQueue()
|
|||
bool ftController::completeFile(std::string hash)
|
||||
{
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
|
||||
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
|
||||
|
||||
|
@ -134,16 +134,17 @@ bool ftController::completeFile(std::string hash)
|
|||
}
|
||||
|
||||
/* check if finished */
|
||||
if (!(it->second).mCreator->finished())
|
||||
//if (!(it->second).mCreator->finished())
|
||||
{
|
||||
/* not done! */
|
||||
return false;
|
||||
//return false;
|
||||
}
|
||||
|
||||
|
||||
ftFileControl *fc = &(it->second);
|
||||
|
||||
/* done - cleanup */
|
||||
fc->mTransfer->done();
|
||||
//fc->mTransfer->done();
|
||||
mDataplex->removeTransferModule(fc->mTransfer->hash());
|
||||
|
||||
delete fc->mTransfer;
|
||||
|
@ -152,7 +153,7 @@ bool ftController::completeFile(std::string hash)
|
|||
delete fc->mCreator;
|
||||
fc->mCreator = NULL;
|
||||
|
||||
fc->mState = COMPLETE;
|
||||
fc->mState = ftFileControl::COMPLETED;
|
||||
|
||||
/* switch map */
|
||||
mCompleted[fc->mHash] = *fc;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue