diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-01-19 23:57:27 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-01-19 23:57:27 +0000 |
| commit | 1c469717a42ef6b0fd894c2ff952a888812db91a (patch) | |
| tree | 67b1340b537b9391e43ea3226abe8f267748a37e | |
| parent | 6abfc32125a043d9e81c3e9bbd450b8414b8194a (diff) | |
Merged revisions 302837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r302837 | russell | 2011-01-19 17:56:48 -0600 (Wed, 19 Jan 2011) | 2 lines
Only check container count if it exists.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 1c8479fd2..896c7b84c 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4781,7 +4781,7 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount struct ast_str *buf; int i; - if (!ao2_container_count(sessions) && AST_RWLIST_EMPTY(&manager_hooks)) { + if (!(sessions && ao2_container_count(sessions)) && AST_RWLIST_EMPTY(&manager_hooks)) { return 0; } |