Fix restart after unexpected termination.

diff --git a/src/service.cc b/src/service.cc
index 2fc07b3504a92fa7719ac59423966534a45c900e..5c2ebde7130cd092f63542a071b57a91f8bac84b 100644 (file)
--- a/src/service.cc
+++ b/src/service.cc
@@ -458,7 +458,7 @@ void service_record::forced_stop() noexcept
         force_stop = true;
         if (! pinned_started) {
             prop_stop = true;
-            services->add_transition_queue(this);
+            services->add_prop_queue(this);
         }
     }
 }

diff --git a/src/tests/test-includes/dinit.h b/src/tests/test-includes/dinit.h
index d97493d8f13a5cdf2a04438d4231dd54cec296bb..3b99881a2e0bc184eaccdb182df65078c18fc0d4 100644 (file)
--- a/src/tests/test-includes/dinit.h
+++ b/src/tests/test-includes/dinit.h
@@ -31,7 +31,8 @@ class eventloop_t
     void advance_time(time_val amount)
     {
         current_time += amount;
-        for (timer * t : active_timers) {
+        auto active_copy = active_timers;
+        for (timer * t : active_copy) {
             if (t->expiry_time >= current_time) {
                 t->stop_timer(*this);
                 rearm r = t->expired(*this, 1);