Revision: 23576 http://trac.macosforge.org/projects/launchd/changeset/23576 Author: zarzycki@apple.com Date: 2008-03-27 14:42:31 -0700 (Thu, 27 Mar 2008) Log Message: ----------- <rdar://problem/5817359> 10.5.3 Regression: 9D8: After installing Final Cut Studio 2, machine fails to restart Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-03-27 21:40:32 UTC (rev 23575) +++ trunk/launchd/src/launchd_core_logic.c 2008-03-27 21:42:31 UTC (rev 23576) @@ -4128,7 +4128,7 @@ * We definitely need to revisit this after Leopard ships. Please see * launchctl.c for the other half of this hack. */ - if (unlikely(j->mgr->global_on_demand_cnt > 0 && is_not_kextd)) { + if (unlikely((j->mgr->shutting_down || j->mgr->global_on_demand_cnt > 0) && is_not_kextd)) { return false; }