commit e10591fc62a7dcf3b1bd1a3bd6c3987334cb5bdc
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 27 22:55:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 22:55:30 2020 +0000
tree 046e6f5b61dc006805a0d5a4ea7b9d6d34a11841
parent cf14ea2c7f37f55cf8286ca588f730ce65229e28
parent 22d634884539ee7995e214a7dccbdad238049f95

Merge "init: do not handle control messages after shutdown"

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 20b4176..7631964 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -901,7 +901,9 @@
                 (*function)();
             }
         }
-        HandleControlMessages();
+        if (!IsShuttingDown()) {
+            HandleControlMessages();
+        }
     }
 
     return 0;