automerge commit

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

diff --git a/asterisk.c b/asterisk.c
index 1c5218685baa03ff63e29e02a548b4874ba07e43..27ed6a67edcfed154b63e8ea8a4f1e4c40d98d85 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -2357,10 +2357,6 @@ int main(int argc, char *argv[])
                printf(term_quit());
                exit(1);
        }
-       if (load_modules(0)) {
-               printf(term_quit());
-               exit(1);
-       }
        if (init_framer()) {
                printf(term_quit());
                exit(1);
@@ -2373,6 +2369,10 @@ int main(int argc, char *argv[])
                printf(term_quit());
                exit(1);
        }
+       if (load_modules(0)) {
+               printf(term_quit());
+               exit(1);
+       }
 
        dnsmgr_start_refresh();