From e12ada37118ab08da3bccdbc08ee34b86f9c85da Mon Sep 17 00:00:00 2001 From: qwell Date: Fri, 20 Apr 2007 21:16:14 +0000 Subject: [PATCH] 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: http://svn.digium.com/svn/asterisk/trunk@61706 f38db490-d61c-443f-a65b-d21fe96a405b --- main/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/loader.c b/main/loader.c index ebad7fda6..e167f474e 100644 --- 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);