From: Matthew Jordan <mjordan@digium.com>
Date: Sat, 19 Apr 2014 02:13:15 +0000 (+0000)
Subject: main/asterisk: Fix startup sequence for realtime features
X-Git-Tag: 12.3.0-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad1d62c3e86e4d5542244781a8dff86675ac0078;p=thirdparty%2Fasterisk.git

main/asterisk: Fix startup sequence for realtime features

When ASTERISK-23265/ASTERISK-23320 was fixed, it inadvertently led to realtime
features breaking. This was due to features loading prior to realtime. This
patch fixes this by loading features after loading dynamic modules.

ASTERISK-23487 #close
Reported by: Denis
Tested by: Denis


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

diff --git a/main/asterisk.c b/main/asterisk.c
index 8cb8eede3f..e3b39302ac 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -4431,11 +4431,6 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (ast_features_init()) {
-		printf("%s", term_quit());
-		exit(1);
-	}
-
 	if (ast_pickup_init()) {
 		printf("%s", term_quit());
 		exit(1);
@@ -4466,6 +4461,11 @@ int main(int argc, char *argv[])
 		exit(moduleresult == -2 ? 2 : 1);
 	}
 
+	if (ast_features_init()) {
+		printf("%s", term_quit());
+		exit(1);
+	}
+
 	if (dnsmgr_init()) {		/* Initialize the DNS manager */
 		printf("%s", term_quit());
 		exit(1);