diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-10-08 14:54:54 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-10-08 14:54:54 +0000 |
| commit | 3dfc485e35d57ceff960a32955277498961d4ed3 (patch) | |
| tree | d5f30ea7e79a9940971ea4dd97366f238295ec9b /main/sounds_index.c | |
| parent | d8bbf1ec1de6a4344ab47a43371b5f6fc594f035 (diff) | |
Indexer: Format message types may not exist
In Asterisk 13+, any given message type is not guaranteed to exist even
if Asterisk comes up correctly since creation of the message type could
be declined. The indexer should not prevent Asterisk from starting
under these conditions.
........
Merged revisions 424833 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/sounds_index.c')
| -rw-r--r-- | main/sounds_index.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/main/sounds_index.c b/main/sounds_index.c index bc5263908..8ca5967e4 100644 --- a/main/sounds_index.c +++ b/main/sounds_index.c @@ -302,17 +302,21 @@ int ast_sounds_index_init(void) return -1; } - res |= stasis_message_router_add( - sounds_system_router, - ast_format_register_type(), - format_update_cb, - NULL); - - res |= stasis_message_router_add( - sounds_system_router, - ast_format_unregister_type(), - format_update_cb, - NULL); + if (ast_format_register_type()) { + res |= stasis_message_router_add( + sounds_system_router, + ast_format_register_type(), + format_update_cb, + NULL); + } + + if (ast_format_unregister_type()) { + res |= stasis_message_router_add( + sounds_system_router, + ast_format_unregister_type(), + format_update_cb, + NULL); + } if (res) { return -1; |