From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 19 Jan 2011 23:57:27 +0000 (+0000)
Subject: Merged revisions 302837 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1955
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c469717a42ef6b0fd894c2ff952a888812db91a;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/manager.c b/main/manager.c
index 1c8479fd22..896c7b84cd 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;
 	}