Skip to content
Snippets Groups Projects
Commit 2a5df21d authored by Joshua Colp's avatar Joshua Colp
Browse files

Merged revisions 50674 via svnmerge from

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

........
r50674 | file | 2007-01-12 22:04:55 -0500 (Fri, 12 Jan 2007) | 2 lines

Only join the snmp thread on an unload if the thread is actually running. (issue #8810 reported by junky)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent cece8001
Branches
Tags
No related merge requests found
......@@ -106,7 +106,7 @@ static int unload_module(void)
ast_verbose(VERBOSE_PREFIX_1 "Unloading [Sub]Agent Module\n");
res_snmp_dont_stop = 0;
return pthread_join(thread, NULL);
return ((thread != AST_PTHREADT_NULL) ? pthread_join(thread, NULL) : 0);
}
static int reload(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment