From: Matthew Jordan <mjordan@digium.com>
Date: Sat, 8 Jun 2013 22:18:38 +0000 (+0000)
Subject: Only initialize manager_bridging during startup
X-Git-Tag: 13.0.0-beta1~1698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3421960162a4857eb365dd87ccf4cd6202643cd4;p=thirdparty%2Fasterisk.git

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

diff --git a/main/manager.c b/main/manager.c
index c2f3520a41..b8e55de4f3 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) {