mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
added removal of turtle handling when canceling/ending a file transfer. next step: Turtle download is now ready for gui integration
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0a7d39d4da
commit
51eb8b8eaf
@ -436,6 +436,8 @@ bool ftController::completeFile(std::string hash)
|
|||||||
|
|
||||||
mDataplex->removeTransferModule(hash_to_suppress) ;
|
mDataplex->removeTransferModule(hash_to_suppress) ;
|
||||||
mDownloads.erase(it);
|
mDownloads.erase(it);
|
||||||
|
|
||||||
|
mTurtle->stopMonitoringFileTunnels(hash_to_suppress) ;
|
||||||
} /******* UNLOCKED ********/
|
} /******* UNLOCKED ********/
|
||||||
|
|
||||||
|
|
||||||
@ -889,10 +891,10 @@ bool ftController::FileCancel(std::string hash)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//fc->mState = ftFileControl::ERROR_COMPLETION;
|
|
||||||
mDownloads.erase(mit);
|
mDownloads.erase(mit);
|
||||||
|
mTurtle->stopMonitoringFileTunnels(hash) ;
|
||||||
|
|
||||||
IndicateConfigChanged(); /* completed transfer -> save */
|
IndicateConfigChanged(); /* completed transfer -> save */
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user