diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-03-25 23:22:44 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-03-25 23:22:44 +0000 |
| commit | b0ac62573a6282a0114d2b23e5a6f04e472fb051 (patch) | |
| tree | b3e0d50fa7bc3c720bbad87b9994028c2ccd6b2f /asterisk.c | |
| parent | d104a6d6224b7ceba7a2c994e8dcc790aeed86e5 (diff) | |
revert loader changes that have clearly not undergone adequate testing before commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
| -rw-r--r-- | asterisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asterisk.c b/asterisk.c index d5394ca0c..e26e6a517 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -882,11 +882,11 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart) if (ast_socket > -1) { close(ast_socket); ast_socket = -1; + unlink(ast_config_AST_SOCKET); + pthread_cancel(lthread); } if (ast_consock > -1) close(ast_consock); - if (ast_socket > -1) - unlink(ast_config_AST_SOCKET); if (!ast_opt_remote) unlink(ast_config_AST_PID); printf(term_quit()); |