diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-12 22:05:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-12 22:05:58 +0000 |
| commit | e2ace6666476f0b6c200b1ff19aa51cd2536a766 (patch) | |
| tree | 10c510cb741cab09cb7c139ccc756a7a7fbc7095 /main/asterisk.c | |
| parent | 227c01ca4774e3fae5c50fe8fcd85c5012f071b9 (diff) | |
Merged revisions 163762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r163762 | tilghman | 2008-12-12 16:04:26 -0600 (Fri, 12 Dec 2008) | 14 lines
Merged revisions 163761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r163761 | tilghman | 2008-12-12 16:03:10 -0600 (Fri, 12 Dec 2008) | 7 lines
Simple fix for Ctrl-C not immediately exiting Asterisk, but also add a
pointer inside editline to look back to asterisk.c, so others don't spend
as much time as I did looking (in the wrong place) for the appropriate
function.
Reported by: ZX81, via the #asterisk-users channel
Fixed by: me (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@163764 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index fff193a2e..94d5e557b 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1931,6 +1931,8 @@ static int ast_el_read_char(EditLine *editline, char *cp) } res = poll(fds, max, -1); if (res < 0) { + if (sig_flags.need_quit) + break; if (errno == EINTR) continue; ast_log(LOG_ERROR, "poll failed: %s\n", strerror(errno)); |