still have to clean pending pub msgs and pointer deleted when sent.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-06-25 13:03:19 +00:00
parent 10353bb129
commit 673369371a

View file

@ -842,7 +842,7 @@ void p3GroupDistrib::locked_publishPendingMsgs()
resave = true; resave = true;
} }
if(store->SendItem(*it)) /* deletes it */ if(!store->SendItem(*it)) /* deletes it */
{ {
ok &= false; ok &= false;
} }
@ -857,7 +857,7 @@ void p3GroupDistrib::locked_publishPendingMsgs()
newCache.recvd = now; newCache.recvd = now;
/* cleanup */ /* cleanup */
mPendingPublish.clear();
delete store; delete store;
if(!RsDirUtil::renameFile(filenametmp,filename)) if(!RsDirUtil::renameFile(filenametmp,filename))
@ -877,10 +877,9 @@ void p3GroupDistrib::locked_publishPendingMsgs()
/* push file to CacheSource */ /* push file to CacheSource */
if(ok){ if(ok)
mPendingPublish.clear();
refreshCache(newCache); refreshCache(newCache);
}
if (ok && resave) if (ok && resave)
{ {