summaryrefslogtreecommitdiff
path: root/jackd/clientengine.c
diff options
context:
space:
mode:
authorpaul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-06-07 01:13:48 +0000
committerpaul <paul@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-06-07 01:13:48 +0000
commit581f790f699e80a6049c15a82349b769e0a27249 (patch)
tree098d8e268e64a9215e78228db2865743766da548 /jackd/clientengine.c
parentfbf63c578f150cf03cb533179ed5070329504bed (diff)
downloadjack1-581f790f699e80a6049c15a82349b769e0a27249.tar.gz
add -Z flag to cancel zombification on timeout
git-svn-id: svn+ssh://jackaudio.org/trunk/jack@1044 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'jackd/clientengine.c')
-rw-r--r--jackd/clientengine.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/jackd/clientengine.c b/jackd/clientengine.c
index b7e0401..8886a28 100644
--- a/jackd/clientengine.c
+++ b/jackd/clientengine.c
@@ -95,7 +95,7 @@ jack_zombify_client (jack_engine_t *engine, jack_client_internal_t *client)
/* this stops jack_deliver_event() from doing anything */
client->control->dead = TRUE;
-
+
jack_client_disconnect_ports (engine, client);
jack_client_do_deactivate (engine, client, FALSE);
}
@@ -201,10 +201,12 @@ jack_remove_clients (jack_engine_t* engine)
client->control->name,
jack_client_state_name (client),
client->error);
- jack_zombify_client (engine,
- (jack_client_internal_t *)
- node->data);
- client->error = 0;
+ if (!engine->nozombies) {
+ jack_zombify_client (engine,
+ (jack_client_internal_t *)
+ node->data);
+ client->error = 0;
+ }
}
need_sort = TRUE;