mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-04-19 14:55:54 -04:00
removed useless reload of channel data. Fixed default implicit conversion from pointer to shared_ptr
This commit is contained in:
parent
ddc0a8c1ec
commit
e56add841a
@ -2519,7 +2519,7 @@ void RsGenExchange::processGroupUpdatePublish()
|
||||
{
|
||||
GroupUpdatePublish& gup = *vit;
|
||||
const RsGxsGroupId& groupId = gup.grpItem->meta.mGroupId;
|
||||
grpMeta.insert(std::make_pair(groupId, (RsGxsGrpMetaData*)(NULL)));
|
||||
grpMeta.insert(std::make_pair(groupId, std::make_shared<RsGxsGrpMetaData>()));
|
||||
}
|
||||
|
||||
if(grpMeta.empty())
|
||||
@ -2985,7 +2985,7 @@ bool RsGenExchange::getGroupKeys(const RsGxsGroupId &grpId, RsTlvSecurityKeySet
|
||||
RS_STACK_MUTEX(mGenMtx) ;
|
||||
|
||||
RsGxsGrpMetaTemporaryMap grpMeta;
|
||||
grpMeta[grpId] = NULL;
|
||||
grpMeta[grpId] = std::make_shared<RsGxsGrpMetaData>();
|
||||
mDataStore->retrieveGxsGrpMetaData(grpMeta);
|
||||
|
||||
if(grpMeta.empty())
|
||||
@ -3078,7 +3078,7 @@ void RsGenExchange::processRecvdMessages()
|
||||
}
|
||||
else
|
||||
{
|
||||
grpMetas.insert(std::make_pair(pend_it->second.mItem->grpId, (RsGxsGrpMetaData*)NULL));
|
||||
grpMetas.insert(std::make_pair(pend_it->second.mItem->grpId, std::make_shared<RsGxsGrpMetaData>()));
|
||||
++pend_it;
|
||||
}
|
||||
}
|
||||
|
@ -93,13 +93,17 @@ p3GxsChannels::p3GxsChannels(
|
||||
mLastDistantSearchNotificationTS = 0;
|
||||
mCommentService = new p3GxsCommentService(this, RS_SERVICE_GXS_TYPE_CHANNELS);
|
||||
|
||||
RsTickEvent::schedule_in(CHANNEL_PROCESS, 0);
|
||||
|
||||
// This is not needed since it just loads all channel data ever 5 mins which takes a lot
|
||||
// of useless CPU/memory.
|
||||
//
|
||||
// RsTickEvent::schedule_in(CHANNEL_PROCESS, 0);
|
||||
//
|
||||
// Test Data disabled in repo.
|
||||
//RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD);
|
||||
//
|
||||
// RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD);
|
||||
|
||||
mGenToken = 0;
|
||||
mGenCount = 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user