Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 16:35:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge with master

Browse source
This commit is contained in:
csoler 2020-01-11 00:08:36 +01:00
commit 2bd5bb5a3e
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
176 changed files with 6345 additions and 3927 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
View file

@ -32,7 +32,6 @@
/****
* #define P3DISC_DEBUG 1
****/
#define P3DISC_DEBUG 1
/*extern*/ std::shared_ptr<RsGossipDiscovery> rsGossipDiscovery(nullptr);
@ -952,11 +951,9 @@ void p3discovery2::processContactInfo(const RsPeerId &fromId, const RsDiscContac
return ; // fresh information here.
bool should_notify_discovery = false;
auto sit= it->second.mSslIds.find(item->sslId);
DiscSslInfo& sslInfo(it->second.mSslIds[item->sslId]); // This line inserts the entry while not removing already existing data
// do not remove it!
if (!mPeerMgr->isFriend(item->sslId))
{
should_notify_discovery = true;