Merged revisions 61705 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61705 | qwell | 2007-04-20 16:15:29 -0500 (Fri, 20 Apr 2007) | 12 lines

Merged revisions 61704 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61704 | qwell | 2007-04-20 16:14:27 -0500 (Fri, 20 Apr 2007) | 4 lines

Fix an issue that I noticed while looking over issue 9571.

The reload timestamp was getting set after reloading the built-in stuff, and before the modules.

........

................

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

diff --git a/main/loader.c b/main/loader.c
index ebad7fda6a45f9e50976c71510ea195b79ea6c70..e167f474efe5fa5346ab0ab759410e7f6b22daae 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -529,6 +529,7 @@ int ast_module_reload(const char *name)
                ast_verbose("The previous reload command didn't finish yet\n");
                return -1;      /* reload already in progress */
        }
+       ast_lastreloadtime = time(NULL);
 
        /* Call "predefined" reload here first */
        for (i = 0; reload_classes[i].name; i++) {
@@ -537,7 +538,6 @@ int ast_module_reload(const char *name)
                        res = 2;        /* found and reloaded */
                }
        }
-       ast_lastreloadtime = time(NULL);
 
        if (name && res) {
                ast_mutex_unlock(&reloadlock);