Merge pull request #998 from jl777/jl777

Prevent sapling activation until ac_sapling set
2018-11-28 00:35:56 -11:00
parent 03383b18b6 a23af09cda
commit b1c4e5eaae
1 changed files with 2 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5624,7 +5624,8 @@ bool static LoadBlockIndexDB()
    if ( (pindex= chainActive.LastTip()) != 0 )
    {
        fprintf(stderr,"set sapling height, if possible from ht.%d %u\n",(int32_t)pindex->GetHeight(),(uint32_t)pindex->nTime);
-        komodo_activate_sapling(pindex);
+        if ( ASSETCHAINS_SAPLING <= 0 )
+            komodo_activate_sapling(pindex);
    }
    return true;
 }