core: fix DBus property ExecMainExitTimestamp

[elogind.git] / src / core / unit.c

diff --git a/src/core/unit.c b/src/core/unit.c
index c0f156c928e5526fa62823d38a98c6d2e9fdbd64..9b36b225fa0151cf4c4256dc4ed12265825eea96 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -949,7 +949,7 @@ bool unit_condition_test(Unit *u) {
         return u->condition_result;
 }
 
-static const char* unit_get_status_message_format(Unit *u, JobType t) {
+_pure_ static const char* unit_get_status_message_format(Unit *u, JobType t) {
         const UnitStatusMessageFormats *format_table;
 
         assert(u);
@@ -966,7 +966,7 @@ static const char* unit_get_status_message_format(Unit *u, JobType t) {
         return format_table->starting_stopping[t == JOB_STOP];
 }
 
-static const char *unit_get_status_message_format_try_harder(Unit *u, JobType t) {
+_pure_ static const char *unit_get_status_message_format_try_harder(Unit *u, JobType t) {
         const char *format;
 
         assert(u);
@@ -2676,6 +2676,9 @@ bool unit_inactive_or_pending(Unit *u) {
 
         /* Returns true if the unit is inactive or going down */
 
+        if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)))
+                return true;
+
         if (unit_stop_pending(u))
                 return true;