Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some optimizations (const std::string&) to the load of the caches at startup and to the p3ConnectMgr.

Browse source 
Added PRE_TARGETDEPS in RetroShare.pro for Windows too.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-12-19 23:50:46 +00:00
parent d4393b8d0b
commit 35f91f5e07
10 changed files with 69 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/dbase/cachestrapper.cc
View file

@ -826,6 +826,10 @@ bool CacheStrapper::loadList(std::list<RsItem *>& load)
std::list<CacheData> remoteCaches;
std::string ownId = mConnMgr->getOwnId();
peerConnectState ownState;
mConnMgr->getOwnNetStatus(ownState);
std::string ownName = ownState.name+" ("+ownState.location+")";
std::map<std::string, std::list<std::string> > saveFiles;
std::map<std::string, std::list<std::string> >::iterator sit;
@ -844,11 +848,9 @@ bool CacheStrapper::loadList(std::list<RsItem *>& load)
cd.pid = rscc->pid;
if(cd.pid == mConnMgr->getOwnId())
if(cd.pid == ownId)
{
peerConnectState pca;
mConnMgr->getOwnNetStatus(pca);
cd.pname = pca.name+" ("+pca.location+")";
cd.pname = ownName;
}
else
{