X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=4eeaf7948d9626b9d8372508002a5e730e8a13be;hb=f208e33c29132aacaec448e74341edea1b925a2a;hp=1d208691596f172482cb26346db29fbcb60905b4;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 1d20869..4eeaf79 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -230,7 +230,7 @@ void TrustListRequester::PopulateIDList()
 
 	// select identities we want to query (we've seen them today and they are publishing trust list) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
 	sql="SELECT IdentityID FROM tblIdentity ";
-	sql+="WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
+	sql+="WHERE Name IS NOT NULL AND Name <> '' AND PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
 	sql+="ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
@@ -274,7 +274,7 @@ void TrustListRequester::Process()
 	// this will recheck for ids every minute
 	DateTime now;
 	now.SetToGMTime();
-	if(m_tempdate<(now-(1.0/1440.0)))
+	if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))
 	{
 		PopulateIDList();
 		m_tempdate=now;