From f80b884e8131c51f42324a78d6147fab79b411d5 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 7 Aug 2012 01:30:39 -0700
Subject: [PATCH] Fix a consensus close time bug.

---
 src/LedgerConsensus.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 3b0d9b41e9..6902ab6599 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -872,13 +872,15 @@ void LedgerConsensus::accept(SHAMap::pointer set)
 	applyTransactions(set, newLCL, newLCL, failedTransactions, true);
 	newLCL->setClosed();
 
-	uint32 closeTime = mOurPosition->getCloseTime();
+	uint32 closeTime = mOurPosition->getCloseTime() - (mOurPosition->getCloseTime() & mCloseResolution);
 	bool closeTimeCorrect = true;
 	if (closeTime == 0)
-	{ // we didn't agree
+	{ // we agreed to disagree
 		closeTimeCorrect = false;
 		closeTime = mPreviousLedger->getCloseTimeNC() + 1;
+		Log(lsINFO) << "Consensus close time (good) " << closeTime;
 	}
+	else Log(lsINFO) << "Consensus close time (bad) " << closeTime;
 
 	newLCL->setAccepted(closeTime, mCloseResolution, closeTimeCorrect);
 	newLCL->updateHash();