Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes from electron.

Browse Source 
- fix for participating list. (list iteration was broken)
 - fix for search limit parameter. (make optional)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-27 01:59:49 +00:00
parent 43fecc2307
commit 2bdc85705e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-nogui/src/rpc/proto/rpcprotochat.cc
View File

@ -1292,13 +1292,13 @@ bool fillLobbyInfoFromChatLobbyInfo(const ChatLobbyInfo &cli, rsctrl::chat::Chat
lobby->set_last_activity(cli.last_activity);
std::set<std::string>::const_iterator pit;
for(pit = cli.participating_friends.begin(); pit != cli.participating_friends.begin(); pit++)
for(pit = cli.participating_friends.begin(); pit != cli.participating_friends.end(); pit++)
{
lobby->add_participating_friends(*pit);
}
std::map<std::string, time_t>::const_iterator mit;
for(mit = cli.nick_names.begin(); mit != cli.nick_names.begin(); mit++)
for(mit = cli.nick_names.begin(); mit != cli.nick_names.end(); mit++)
{
lobby->add_nicknames(mit->first);
}

2
retroshare-nogui/src/rpc/proto/rpcprotosearch.cc
View File

@ -634,7 +634,7 @@ bool condenseSearchResults(const std::list<TurtleFileInfo> &searchResults, uint3
}
unsigned int i = 0;
for(mit = searchMap.begin(); (mit != searchMap.end()) && (i < limit); mit++, i++)
for(mit = searchMap.begin(); (mit != searchMap.end()) && (i < limit || limit == 0); mit++, i++)
{
std::map<std::string, uint32_t>::reverse_iterator nit;
nit = mit->second.name_map.rbegin();