summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-07-14 21:11:09 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-07-14 21:11:09 +0000
commit4c94d1ee23f1c02572306cdc83f3748e11648321 (patch)
tree949ce9755eda3c79fa3187bcf313ecff7c970802
parent832d1296c61477eb5c5848b64cf48b36e636bfb0 (diff)
Oops, merge reverted this fix.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c
index 8a3d18bdb..0249af9d8 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -836,7 +836,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
return required ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_DECLINE;
}
- if (!mod->lib && mod->info->backup_globals()) {
+ if (!mod->lib && mod->info->backup_globals && mod->info->backup_globals()) {
ast_log(LOG_WARNING, "Module '%s' was unable to backup its global data.\n", resource_name);
return required ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_DECLINE;
}