Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-10 18:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge with upstream/master

Browse source
This commit is contained in:
csoler 2018-07-19 23:22:24 +02:00
commit 2bab688dec
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
99 changed files with 4868 additions and 904 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libresapi/src/api/FileSearchHandler.cpp
View file

@ -211,9 +211,9 @@ void FileSearchHandler::handleCreateSearch(Request &req, Response &resp)
// i have no idea what the reasons for two different search modes are
// rs-gui does it, so do we
if(words.size() == 1)
search_id = mTurtle->turtleSearch(words.front());
search_id = rsFiles->turtleSearch(words.front());
else
search_id = mTurtle->turtleSearch(lin_exp);
search_id = rsFiles->turtleSearch(lin_exp);
}
std::list<FileDetail> results;