mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 19:12:28 -04:00
- removed calls to rsfiles->get{Download,Partials}Directory() in RsDiscSpace class, since it would trigger a call to ftController
- added a lock into ftTransferModule::recvFileData() (Crash reported by Costa due to storing data in a deleted transfer module) - changed names of functions in ftTransferModules to locked_* when appropriate (helps debugging) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
3ed0c1d885
commit
97ed1d534f
5 changed files with 75 additions and 57 deletions
|
@ -1499,6 +1499,8 @@ bool ftController::setDownloadDirectory(std::string path)
|
|||
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
|
||||
|
||||
mDownloadPath = RsDirUtil::convertPathToUnix(path);
|
||||
|
||||
RsDiscSpace::setDownloadPath(mDownloadPath) ;
|
||||
#ifdef CONTROL_DEBUG
|
||||
std::cerr << "ftController::setDownloadDirectory() Okay!";
|
||||
std::cerr << std::endl;
|
||||
|
@ -1547,6 +1549,8 @@ bool ftController::setPartialsDirectory(std::string path)
|
|||
|
||||
mPartialsPath = path;
|
||||
|
||||
RsDiscSpace::setPartialsPath(path) ;
|
||||
|
||||
#if 0 /*** FIX ME !!!**************/
|
||||
/* move all existing files! */
|
||||
std::map<std::string, ftFileControl>::iterator it;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue