diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 21:25:49 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 21:25:49 +0000 |
| commit | b9ea142bcbb7aa85dbe79b6c743ba0254f112a0e (patch) | |
| tree | a2430d086c86531a6963ed3c53030a4810c24218 /include | |
| parent | 03275acea2a3e04f0b409b3bfe9aacb9c163fa56 (diff) | |
Merged revisions 199298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r199298 | dvossel | 2009-06-05 16:21:22 -0500 (Fri, 05 Jun 2009) | 21 lines
Merged revisions 199297 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r199297 | dvossel | 2009-06-05 16:19:56 -0500 (Fri, 05 Jun 2009) | 14 lines
Fixes issue with hints giving unexpected results.
Hints with two or more devices that include ONHOLD gave unexpected results.
(closes issue #15057)
Reported by: p_lindheimer
Patches:
onhold_trunk.diff uploaded by dvossel (license 671)
pbx.c.1.4.patch uploaded by p (license 558)
devicestate.c.trunk.patch uploaded by p (license 671)
Tested by: p_lindheimer, dvossel
Review: https://reviewboard.asterisk.org/r/254/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@199299 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/devicestate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h index e4634a797..4034d9dca 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -256,7 +256,7 @@ struct ast_devstate_aggregate { unsigned int all_unavail:1; unsigned int all_busy:1; unsigned int all_free:1; - unsigned int all_on_hold:1; + unsigned int on_hold:1; unsigned int busy:1; unsigned int in_use:1; unsigned int ring:1; |