mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-14 17:07:17 -05:00
changed the reset of client map into a reset f server map when subscribing a group
This commit is contained in:
parent
2d438b7407
commit
9e0dc01110
@ -862,15 +862,20 @@ void RsGxsNetService::subscribeStatusChanged(const RsGxsGroupId& grpId,bool subs
|
|||||||
// gets requested once again, for a proper update.
|
// gets requested once again, for a proper update.
|
||||||
|
|
||||||
#ifdef NXS_NET_DEBUG_0
|
#ifdef NXS_NET_DEBUG_0
|
||||||
GXSNETDEBUG__G(grpId) << "Changing subscribe status for grp " << grpId << " to " << subscribed << ": reseting all msg time stamps." << std::endl;
|
GXSNETDEBUG__G(grpId) << "Changing subscribe status for grp " << grpId << " to " << subscribed << ": reseting all server msg time stamps for this group, and server global TS." << std::endl;
|
||||||
#endif
|
#endif
|
||||||
for(ClientMsgMap::iterator it(mClientMsgUpdateMap.begin());it!=mClientMsgUpdateMap.end();++it)
|
std::map<RsGxsGroupId,RsGxsServerMsgUpdateItem*>::iterator it = mServerMsgUpdateMap.find(grpId) ;
|
||||||
|
|
||||||
|
if(mServerMsgUpdateMap.end() == it)
|
||||||
{
|
{
|
||||||
std::map<RsGxsGroupId,RsGxsMsgUpdateItem::MsgUpdateInfo>::iterator it2 = it->second->msgUpdateInfos.find(grpId) ;
|
RsGxsServerMsgUpdateItem *item = new RsGxsServerMsgUpdateItem(mServType) ;
|
||||||
|
item->grpId = grpId ;
|
||||||
if(it2 != it->second->msgUpdateInfos.end())
|
item->msgUpdateTS = 0 ;
|
||||||
it->second->msgUpdateInfos.erase(it2) ;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
it->second->msgUpdateTS = 0 ; // reset!
|
||||||
|
|
||||||
|
// no need to update mGrpServerUpdateItem since the ::updateServerSyncTS() call will do it.
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RsGxsNetService::fragmentMsg(RsNxsMsg& msg, MsgFragments& msgFragments) const
|
bool RsGxsNetService::fragmentMsg(RsNxsMsg& msg, MsgFragments& msgFragments) const
|
||||||
|
Loading…
Reference in New Issue
Block a user