Only initialize manager_bridging during startup
authorMatthew Jordan <mjordan@digium.com>
Sat, 8 Jun 2013 22:18:38 +0000 (22:18 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 8 Jun 2013 22:18:38 +0000 (22:18 +0000)
This moves the initialization call behind the protection against
reloads. We don't want to re-add message router routes during
reloads.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391016 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index c2f3520..b8e55de 100644 (file)
@@ -7739,10 +7739,9 @@ static int __init_manager(int reload, int by_external_config)
                        ast_log(AST_LOG_ERROR, "Failed to initialize manager MWI handling\n");
                        return -1;
                }
-       }
-
-       if (manager_bridging_init()) {
-               return -1;
+               if (manager_bridging_init()) {
+                       return -1;
+               }
        }
 
        if (!registered) {