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

fixed merge with upstream

Browse source
This commit is contained in:
csoler 2018-06-22 23:38:31 +02:00
commit 5b9666855d
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
241 changed files with 20561 additions and 3381 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/gxstrans/p3gxstrans.cc
View file

@ -455,7 +455,7 @@ void p3GxsTrans::GxsTransIntegrityCleanupThread::run()
if(stored_msgs.end() != it2)
{
msgsToDel[it2->second.first].push_back(it2->second.second);
msgsToDel[it2->second.first].insert(it2->second.second);
#ifdef DEBUG_GXSTRANS
std::cerr << " scheduling msg " << std::hex << it2->second.first << "," << it2->second.second << " for deletion." << std::endl;