From 6cdb3343208ee4f96a07535033d9fef207f2ecb3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 21 Aug 2018 07:39:35 -1100
Subject: [PATCH] Test

---
 src/init.cpp | 17 +++++++++++++++++
 src/main.cpp | 15 ---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index a9bdc6151..0ac25a449 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1339,6 +1339,23 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // ********************************************************* Step 7: load block chain
 
     fReindex = GetBoolArg("-reindex", false);
+    bool checkval;
+    fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX);
+    pblocktree->ReadFlag("addressindex", checkval);
+    if ( checkval != fAddressIndex  )
+    {
+        pblocktree->WriteFlag("addressindex", fAddressIndex);
+        fprintf(stderr,"set addressindex, will reindex. sorry will take a while.\n");
+        fReindex = true;
+    }
+    fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX);
+    pblocktree->ReadFlag("spentindex", checkval);
+    if ( checkval != fSpentIndex )
+    {
+        pblocktree->WriteFlag("spentindex", fSpentIndex);
+        fprintf(stderr,"set spentindex, will reindex. sorry will take a while.\n");
+        fReindex = true;
+    }
 
     // Upgrading to 0.8; hard-link the old blknnnn.dat files into /blocks/
     boost::filesystem::path blocksDir = GetDataDir() / "blocks";
diff --git a/src/main.cpp b/src/main.cpp
index e4b2f0500..8231c449b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5323,21 +5323,6 @@ bool InitBlockIndex() {
     // Check whether we're already initialized
     if (chainActive.Genesis() != NULL)
     {
-        bool checkval;
-        fAddressIndex = GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX);
-        pblocktree->ReadFlag("addressindex", checkval);
-        if ( checkval != fAddressIndex )
-        {
-            pblocktree->WriteFlag("addressindex", fAddressIndex);
-            fprintf(stderr,"set addressindex\n");
-        }
-        fSpentIndex = GetBoolArg("-spentindex", DEFAULT_SPENTINDEX);
-        pblocktree->ReadFlag("spentindex", checkval);
-        if ( checkval != fSpentIndex )
-        {
-            pblocktree->WriteFlag("spentindex", fSpentIndex);
-            fprintf(stderr,"set spentindex\n");
-        }
         return true;
     }
     // Use the provided setting for -txindex in the new database