Merge pull request libbitcoin#976 from evoskuil/master

evoskuil · web-flow · commit 476eb304779c · 2026-03-02T18:30:44.000-05:00
Guard disk_timer_ to allow stop without start().
diff --git a/Makefile.am b/Makefile.am
@@ -89,7 +89,6 @@ test_libbitcoin_node_test_SOURCES = \
     test/error.cpp \
     test/full_node.cpp \
     test/main.cpp \
-    test/node.cpp \
     test/settings.cpp \
     test/test.cpp \
     test/test.hpp \
diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -331,7 +331,6 @@ if (with-tests)
         "../../test/error.cpp"
         "../../test/full_node.cpp"
         "../../test/main.cpp"
-        "../../test/node.cpp"
         "../../test/settings.cpp"
         "../../test/test.cpp"
         "../../test/test.hpp"
diff --git a/builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj b/builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj
@@ -133,7 +133,6 @@
     <ClCompile Include="..\..\..\..\test\error.cpp" />
     <ClCompile Include="..\..\..\..\test\full_node.cpp" />
     <ClCompile Include="..\..\..\..\test\main.cpp" />
-    <ClCompile Include="..\..\..\..\test\node.cpp" />
     <ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
     <ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
     <ClCompile Include="..\..\..\..\test\settings.cpp" />
diff --git a/builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj.filters
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\..\..\test\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\node.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\test\protocols\protocol.cpp">
       <Filter>src\protocols</Filter>
     </ClCompile>
diff --git a/src/chasers/chaser_storage.cpp b/src/chasers/chaser_storage.cpp
@@ -63,8 +63,11 @@ void chaser_storage::stopping(const code& ec) NOEXCEPT
 void chaser_storage::do_stopping(const code&) NOEXCEPT
 {
     BC_ASSERT(stranded());
-    disk_timer_->stop();
-    disk_timer_.reset();
+    if (disk_timer_)
+    {
+        disk_timer_->stop();
+        disk_timer_.reset();
+    }
 }
 
 // event handlers
diff --git a/test/node.cpp b/test/node.cpp

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,11 @@ void chaser_storage::stopping(const code& ec) NOEXCEPT`
`63`	`63`	`void chaser_storage::do_stopping(const code&) NOEXCEPT`
`64`	`64`	`{`
`65`	`65`	`BC_ASSERT(stranded());`
`66`		`- disk_timer_->stop();`
`67`		`- disk_timer_.reset();`
	`66`	`+ if (disk_timer_)`
	`67`	`+ {`
	`68`	`+ disk_timer_->stop();`
	`69`	`+ disk_timer_.reset();`
	`70`	`+ }`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`// event handlers`