summaryrefslogtreecommitdiff
path: root/main/manager.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-06-08 22:18:38 +0000
committerMatthew Jordan <mjordan@digium.com>2013-06-08 22:18:38 +0000
commit3421960162a4857eb365dd87ccf4cd6202643cd4 (patch)
tree093679b44e6a0ba0228b415d8b33317596405207 /main/manager.c
parentc43f380d036783ae10c426f23e8863ec1efdaa68 (diff)
Only initialize manager_bridging during startup
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
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/main/manager.c b/main/manager.c
index c2f3520a4..b8e55de4f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -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) {