diff options
| author | Roy Marples <roy@marples.name> | 2007-04-10 10:33:44 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-04-10 10:33:44 +0000 |
| commit | 0c98067d57606c59866e9ff35f2a6aedaaedaf76 (patch) | |
| tree | 6cb5a27b2e26d8c669770b3ff3b2516ff2e3db98 /src/runscript.c | |
| parent | c5ddc6ef74460f72ea56350c6ff002c9630f6552 (diff) | |
Misc network fixes so we work on my stable server. Splash plugin removed as splashtuils-1.4 now ships with its own.
Diffstat (limited to 'src/runscript.c')
| -rw-r--r-- | src/runscript.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/runscript.c b/src/runscript.c index ad8a251c..0b440e29 100644 --- a/src/runscript.c +++ b/src/runscript.c @@ -234,14 +234,7 @@ static void cleanup (void) if (in_control ()) { - if (rc_service_state (applet, rc_service_starting)) - { - if (rc_service_state (applet, rc_service_wasinactive)) - rc_mark_service (applet, rc_service_inactive); - else - rc_mark_service (applet, rc_service_stopped); - } - else if (rc_service_state (applet, rc_service_stopping)) + if (rc_service_state (applet, rc_service_stopping)) { /* If the we're shutting down, do it cleanly */ if ((softlevel && @@ -254,6 +247,13 @@ static void cleanup (void) else rc_mark_service (applet, rc_service_started); } + else if (rc_service_state (applet, rc_service_starting)) + { + if (rc_service_state (applet, rc_service_wasinactive)) + rc_mark_service (applet, rc_service_inactive); + else + rc_mark_service (applet, rc_service_stopped); + } if (exclusive && rc_exists (exclusive)) unlink (exclusive); } @@ -778,7 +778,7 @@ static void svc_stop (const char *service, bool deps) if (rc_service_state (service, rc_service_wasinactive)) rc_mark_service (service, rc_service_inactive); else - rc_mark_service (service, rc_service_stopped); + rc_mark_service (service, rc_service_started); eerrorx ("ERROR: %s failed to stop", applet); } |