From 554234d385553023a431df6173c779b7f987cb0b Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Fri, 31 May 2013 12:42:16 +0000
Subject: [PATCH] no time stamp when merging from disk without signature
 modification

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/pgp/pgphandler.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc
index f530a5396..22e95cdcd 100644
--- a/libretroshare/src/pgp/pgphandler.cc
+++ b/libretroshare/src/pgp/pgphandler.cc
@@ -930,14 +930,16 @@ bool PGPHandler::addOrMergeKey(ops_keyring_t *keyring,std::map<std::string,PGPCe
 		std::cerr << "  Key exists. Merging signatures." << std::endl;
 #endif
 		ret = mergeKeySignatures(const_cast<ops_keydata_t*>(existing_key),keydata) ;
-		res->second._time_stamp = time(NULL) ;
 
 		if(ret)
 			initCertificateInfo(kmap[id.toStdString()],existing_key,res->second._key_index) ;
 	}
 
 	if(ret)
+	{
 		validateAndUpdateSignatures(kmap[id.toStdString()],existing_key) ;
+		kmap[id.toStdString()]._time_stamp = time(NULL) ;
+	}
 
 	return ret ;
 }