From 673369371a9d39b7405fb87cc6a0bdd644b013b6 Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Fri, 25 Jun 2010 13:03:19 +0000 Subject: [PATCH] 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 --- libretroshare/src/services/p3distrib.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/services/p3distrib.cc b/libretroshare/src/services/p3distrib.cc index b64d0cf13..073c41635 100644 --- a/libretroshare/src/services/p3distrib.cc +++ b/libretroshare/src/services/p3distrib.cc @@ -842,7 +842,7 @@ void p3GroupDistrib::locked_publishPendingMsgs() resave = true; } - if(store->SendItem(*it)) /* deletes it */ + if(!store->SendItem(*it)) /* deletes it */ { ok &= false; } @@ -857,7 +857,7 @@ void p3GroupDistrib::locked_publishPendingMsgs() newCache.recvd = now; /* cleanup */ - + mPendingPublish.clear(); delete store; if(!RsDirUtil::renameFile(filenametmp,filename)) @@ -877,10 +877,9 @@ void p3GroupDistrib::locked_publishPendingMsgs() /* push file to CacheSource */ - if(ok){ - mPendingPublish.clear(); + if(ok) refreshCache(newCache); - } + if (ok && resave) {