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

diff --git a/main/sounds_index.c b/main/sounds_index.c
index bc5263908e563869c2938ea29f6e5c84c20bb31c..8ca5967e4d48f68d58d55971462e0fd219eca6e6 100644 (file)
--- 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;