Merge pull request #936 from AntelopeIO/GH-596-fork-db-3.2

[3.2] forkdb reset in replay since blocks are signaled
AntelopeIO · Mar 31, 2023 · d9a4772 · d9a4772
2 parents 4359bc0 + 51c4bea
commit d9a4772
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -477,12 +477,13 @@ struct controller_impl {
    }
 
    void replay(std::function<bool()> check_shutdown) {
-      if( !blog.head() && !fork_db.root() ) {
+      auto blog_head = blog.head();
+      if( !fork_db.root() ) {
          fork_db.reset( *head );
-         return;
+         if (!blog_head)
+            return;
       }
 
-      auto blog_head = blog.head();
       replaying = true;
       auto start_block_num = head->block_num + 1;
       auto start = fc::time_point::now();