mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-05 07:35:12 -04:00
Revert "Merge branch 'singleFileClient'"
This reverts commit 1bf9ed770532f3093548fa4120209be3a31c5c21, reversing changes made to 5b0464d7a0aaa034851dfc80ca0a2d367f4c28ef. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
693cb93868
commit
22dea2ceea
3 changed files with 3 additions and 32 deletions
|
@ -96,11 +96,7 @@ bool FileIndexMonitor::findLocalFile(std::string hash,
|
|||
|
||||
size = fe->size;
|
||||
ok = true;
|
||||
} else {
|
||||
fullpath = fe->name;
|
||||
size = fe->size;
|
||||
ok = true;
|
||||
}
|
||||
}
|
||||
#ifdef FIM_DEBUG
|
||||
std::cerr << "FileIndexMonitor::findLocalFile() Found Path: " << fullpath << std::endl;
|
||||
std::cerr << "FileIndexMonitor::findLocalFile() Found Size: " << size << std::endl;
|
||||
|
@ -136,13 +132,7 @@ bool FileIndexMonitor::convertSharedFilePath(std::string path, std::string &f
|
|||
std::cerr << "FileIndexMonitor::convertSharedFilePath() Found Path: " << fullpath << std::endl;
|
||||
#endif
|
||||
ok = true;
|
||||
} else {
|
||||
fullpath = path;
|
||||
ok = true;
|
||||
#ifdef FIM_DEBUG
|
||||
std::cerr << "FileIndexMonitor::convertSharedFilePath() Found Path: " << fullpath << std::endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
} fiMutex.unlock(); /* UNLOCKED DIRS */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue