Finish heartbeat thread after finishing dispatch

Author: wk9874

simvue/run.py

@@ -585,12 +585,6 @@ def _error(self, message: str, join_threads: bool = True) -> None:
         RuntimeError
             exception throw
         """
-        # Stop heartbeat
-        if self._heartbeat_termination_trigger and self._heartbeat_thread:
-            self._heartbeat_termination_trigger.set()
-            if join_threads:
-                self._heartbeat_thread.join()
-
         # Finish stopping all threads
         if self._shutdown_event:
             self._shutdown_event.set()
@@ -601,6 +595,12 @@ def _error(self, message: str, join_threads: bool = True) -> None:
             if join_threads:
                 self._dispatcher.join()
 
+        # Stop heartbeat
+        if self._heartbeat_termination_trigger and self._heartbeat_thread:
+            self._heartbeat_termination_trigger.set()
+            if join_threads:
+                self._heartbeat_thread.join()
+
         if not self._suppress_errors:
             raise SimvueRunError(message)
 
@@ -1861,10 +1861,6 @@ def set_status(
     def _tidy_run(self) -> None:
         self._executor.wait_for_completion()
 
-        if self._heartbeat_thread and self._heartbeat_termination_trigger:
-            self._heartbeat_termination_trigger.set()
-            self._heartbeat_thread.join()
-
         if self._shutdown_event:
             self._shutdown_event.set()
 
@@ -1877,6 +1873,10 @@ def _tidy_run(self) -> None:
             self._dispatcher.purge()
             self._dispatcher.join()
 
+        if self._heartbeat_thread and self._heartbeat_termination_trigger:
+            self._heartbeat_termination_trigger.set()
+            self._heartbeat_thread.join()
+
         if (
             self._sv_obj
             and self._user_config.run.mode == "offline"