Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug preventing correct subscribe in GxsTrans

Browse Source
This commit is contained in:
csoler 2017-06-29 18:37:39 +02:00
parent 700d114cf4
commit 64e3fc97e8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/gxstrans/p3gxstrans.cc
View File

@ -183,7 +183,11 @@ void p3GxsTrans::handleResponse(uint32_t token, uint32_t req_type)
const RsGroupMetaData& meta = grp->meta; const RsGroupMetaData& meta = grp->meta;
bool subscribed = IS_GROUP_SUBSCRIBED(meta.mSubscribeFlags); bool subscribed = IS_GROUP_SUBSCRIBED(meta.mSubscribeFlags);
bool old = meta.mLastPost > 0 && olderThen( meta.mLastPost, UNUSED_GROUP_UNSUBSCRIBE_INTERVAL );
// if mLastPost is 0, then the group is not subscribed, so it only has impact on shouldSubscribe. In any case, a group
// with no information shouldn't be subscribed, so the olderThen() test is still valid in the case mLastPost=0.
bool old = olderThen( meta.mLastPost, UNUSED_GROUP_UNSUBSCRIBE_INTERVAL );
uint32_t token; uint32_t token;
bool shouldSubscribe = false ; bool shouldSubscribe = false ;
@ -191,8 +195,8 @@ void p3GxsTrans::handleResponse(uint32_t token, uint32_t req_type)
{ {
RS_STACK_MUTEX(mDataMutex); RS_STACK_MUTEX(mDataMutex);
shouldSubscribe = !subscribed && ((!old)|| meta.mGroupId == mPreferredGroupId ); shouldSubscribe = (!subscribed) && ((!old)|| meta.mGroupId == mPreferredGroupId );
shouldUnSubscribe = subscribed && old && meta.mGroupId != mPreferredGroupId; shouldUnSubscribe = ( subscribed) && old && meta.mGroupId != mPreferredGroupId;
} }
#ifdef DEBUG_GXSTRANS #ifdef DEBUG_GXSTRANS