Disable compatible ledger safety if quorum is strict

src/ripple/app/ledger/impl/LedgerMaster.cpp

@@ -194,6 +194,13 @@ public:
     bool isCompatible (Ledger::pointer ledger,
         beast::Journal::Stream s, const char* reason) override
     {
+        if (mStrictValCount)
+        {
+            // If we're only using validation count, then we can't
+            // reject a ledger even if it's ioncompatible
+            return true;
+        }
+
         auto validLedger = getValidatedLedger();
 
         if (validLedger &&

src/ripple/app/misc/NetworkOPs.cpp

@@ -1087,8 +1087,9 @@ void NetworkOPsImp::tryStartConsensus ()
         // check if the ledger is good enough to go to omFULL
         // Note: Do not go to omFULL if we don't have the previous ledger
         // check if the ledger is bad enough to go to omCONNECTED -- TODO
+        auto current = m_ledgerMaster.getCurrentLedger();
         if (app_.timeKeeper().now().time_since_epoch().count() <
-            m_ledgerMaster.getCurrentLedger ()->info().closeTime)
+            (current->info().parentCloseTime + 2* current->info().closeTimeResolution))
         {
             setMode (omFULL);
         }