diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 18:33:05 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 18:33:05 +0000 |
| commit | dee5675cc4da0f9e12bee213f550ab48f4110ea1 (patch) | |
| tree | 68e8b187310d07c1593952d0700f0ad081febf3c /main | |
| parent | 3311ecd2c8f11a5cb7f83be944fd56e9401d3114 (diff) | |
Merged revisions 277331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r277331 | mnicholson | 2010-07-16 13:31:08 -0500 (Fri, 16 Jul 2010) | 15 lines
Merged revisions 277327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r277327 | mnicholson | 2010-07-16 13:30:22 -0500 (Fri, 16 Jul 2010) | 8 lines
Interpret device state AST_DEVICE_UNKNOWN as extension state AST_EXTENSION_NOT_INUSE.
(closes issue #16035)
Reported by: francesco_r
Patches:
pbx.c.patch uploaded by viniciusfontes (license 978)
Tested by: francesco_r, agx, lawbar
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277338 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 84d168d9a..505abf382 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3774,8 +3774,9 @@ enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devst return AST_EXTENSION_ONHOLD; case AST_DEVICE_BUSY: return AST_EXTENSION_BUSY; - case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_UNKNOWN: + return AST_EXTENSION_NOT_INUSE; + case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_INVALID: return AST_EXTENSION_UNAVAILABLE; case AST_DEVICE_RINGINUSE: |