[svn-commits] mjordan: trunk r391016 - /trunk/main/manager.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Jun  8 17:18:38 2013
New Revision: 391016

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391016
Log:
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.

Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=391016&r1=391015&r2=391016
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sat Jun  8 17:18:38 2013
@@ -7739,10 +7739,9 @@
 			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) {